# HG changeset patch # User John W. Eaton # Date 1355244835 18000 # Node ID ec254dafca4695dd1a4045bb3f538a2de1897755 # Parent 58078b123b7323cf6fe666806d9fd0f4a361b0d0 restore original shared lib build rules for nettle package diff -r 58078b123b73 -r ec254dafca46 src/nettle.mk --- 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