Mercurial > mxe-octave

changeset 2910:ec254dafca46

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
restore original shared lib build rules for nettle package
author John W. Eaton <jwe@octave.org>
date Tue, 11 Dec 2012 11:53:55 -0500
parents 58078b123b73
children 5fa15cc31dd3
files src/nettle.mk
diffstat 1 files changed, 1 insertions(+), 17 deletions(-) [+]
line wrap: on
line diff
--- a/src/nettle.mk	Tue Dec 11 11:47:59 2012 -0500
+++ b/src/nettle.mk	Tue Dec 11 11:53:55 2012 -0500
@@ -20,24 +20,8 @@
     cd '$(1)' && ./configure \
         --host='$(TARGET)' \
         --build="`config.guess`" \
-        --enable-static --disable-shared \
+        $(ENABLE_SHARED_OR_STATIC) \
         --prefix='$(PREFIX)/$(TARGET)'
     $(MAKE) -C '$(1)' -j '$(JOBS)' getopt.o getopt1.o
     $(MAKE) -C '$(1)' -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/libnettle.a'; \
-      $(INSTALL) -m755 '$(PREFIX)/$(TARGET)/lib/libnettle.dll.a' '$(PREFIX)/$(TARGET)/lib/libnettle.dll.a'; \
-      $(INSTALL) -m755 '$(PREFIX)/$(TARGET)/lib/libnettle.dll' '$(PREFIX)/$(TARGET)/bin/libnettle.dll'; \
-      rm -f '$(PREFIX)/$(TARGET)/lib/libnettle.dll'; \
-      rm -f '$(PREFIX)/$(TARGET)/lib/libnettle.la'; \
- \
-      $(MAKE_SHARED_FROM_STATIC) --ar '$(TARGET)-ar' --ld '$(TARGET)-gcc' '$(PREFIX)/$(TARGET)/lib/libhogweed.a' -lnettle -lgmp; \
-      $(INSTALL) -m755 '$(PREFIX)/$(TARGET)/lib/libhogweed.dll.a' '$(PREFIX)/$(TARGET)/lib/libhogweed.dll.a'; \
-      $(INSTALL) -m755 '$(PREFIX)/$(TARGET)/lib/libhogweed.dll' '$(PREFIX)/$(TARGET)/bin/libhogweed.dll'; \
-      rm -f '$(PREFIX)/$(TARGET)/lib/libhogweed.dll'; \
-      rm -f '$(PREFIX)/$(TARGET)/lib/libhogweed.la'; \
-    fi
 endef