# HG changeset patch # User John W. Eaton # Date 1357601071 18000 # Node ID e18f5b46e77c7255c756c4391a92809f2d582739 # Parent 1afd21db3bf1e0904ca5dec175920b6950796567 update libtool usage for qhull diff -r 1afd21db3bf1 -r e18f5b46e77c src/qhull-2-fixes.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/qhull-2-fixes.patch Mon Jan 07 18:24:31 2013 -0500 @@ -0,0 +1,28 @@ +diff -rNu a/configure.ac b/configure.ac +--- a/configure.ac 2009-06-11 15:41:03.000000000 -0400 ++++ b/configure.ac 2013-01-07 18:05:58.439590407 -0500 +@@ -8,10 +8,10 @@ + AC_CONFIG_AUX_DIR(config) + AC_CONFIG_MACRO_DIR(config) + +-AM_INIT_AUTOMAKE ++AM_INIT_AUTOMAKE([foreign]) + + AC_PROG_CC +-AC_PROG_LIBTOOL ++LT_INIT([win32-dll]) + + AC_CONFIG_FILES([ + Makefile +diff -rNu a/src/Makefile.am b/src/Makefile.am +--- a/src/Makefile.am 2009-06-11 15:41:03.000000000 -0400 ++++ b/src/Makefile.am 2013-01-07 17:58:04.327616699 -0500 +@@ -23,7 +23,7 @@ + mem.c + + # how: +-libqhull_la_LDFLAGS = -version-info 5:0:0 -lm ++libqhull_la_LDFLAGS = -no-undefined -version-info 5:0:0 -lm + + ### Utility programs + diff -r 1afd21db3bf1 -r e18f5b46e77c src/qhull.mk --- a/src/qhull.mk Fri Jan 04 23:56:25 2013 -0500 +++ b/src/qhull.mk Mon Jan 07 18:24:31 2013 -0500 @@ -15,21 +15,12 @@ endef define $(PKG)_BUILD - # build GCC and support libraries + cd '$(1)' && aclocal && libtoolize && autoreconf mkdir '$(1)/.build' cd '$(1)/.build' && '$(1)/configure' \ --host='$(TARGET)' \ --build="`config.guess`" \ - --enable-static --disable-shared \ + $(ENABLE_SHARED_OR_STATIC) \ --prefix='$(PREFIX)/$(TARGET)' $(MAKE) -C '$(1)/.build' -j '$(JOBS)' install - - if [ $(BUILD_SHARED) = yes ]; then \ - $(INSTALL) -d '$(PREFIX)/$(TARGET)/bin'; \ - $(MAKE_SHARED_FROM_STATIC) --ar '$(TARGET)-ar' --ld '$(TARGET)-gcc' '$(PREFIX)/$(TARGET)/lib/libqhull.a'; \ - $(INSTALL) -m755 '$(PREFIX)/$(TARGET)/lib/libqhull.dll.a' '$(PREFIX)/$(TARGET)/lib/libqhull.dll.a'; \ - $(INSTALL) -m755 '$(PREFIX)/$(TARGET)/lib/libqhull.dll' '$(PREFIX)/$(TARGET)/bin/libqhull.dll'; \ - rm -f '$(PREFIX)/$(TARGET)/lib/libqhull.dll'; \ - rm -f '$(PREFIX)/$(TARGET)/lib/libqhull.la'; \ - fi endef