Mercurial > hg > mxe

changeset 3069:8d89eccf60a6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix nettle build
author John W. Eaton <jwe@octave.org>
date Thu, 29 Nov 2012 09:41:54 -0500
parents 7811f0697a7a
children 426bca8b039e
files src/nettle.mk
diffstat 1 files changed, 17 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/src/nettle.mk
+++ b/src/nettle.mk
@@ -20,8 +20,24 @@
     cd '$(1)' && ./configure \
         --host='$(TARGET)' \
         --build="`config.guess`" \
-        $(ENABLE_SHARED_OR_STATIC) \
+        --enable-static --disable-shared \
         --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