# HG changeset patch # User John W. Eaton # Date 1354200114 18000 # Node ID 8d89eccf60a62a721cc7094b52a67270ff9356f2 # Parent 7811f0697a7a359f1143748a3377ea6ea4f31d40 fix nettle build diff -r 7811f0697a7a -r 8d89eccf60a6 src/nettle.mk --- a/src/nettle.mk Wed Nov 28 21:23:43 2012 -0500 +++ b/src/nettle.mk Thu Nov 29 09:41:54 2012 -0500 @@ -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