# HG changeset patch # User John W. Eaton # Date 1354150581 18000 # Node ID 5d6a0103c1fc5db1c2194b58d213f152e37c9e43 # Parent c766e4afd49359a2340714578f359e92371ff5aa build shared libs from static libs for gnutls diff -r c766e4afd493 -r 5d6a0103c1fc src/gnutls.mk --- a/src/gnutls.mk Wed Nov 28 19:42:55 2012 -0500 +++ b/src/gnutls.mk Wed Nov 28 19:56:21 2012 -0500 @@ -27,7 +27,7 @@ cd '$(1)' && ./configure \ --host='$(TARGET)' \ --build="`config.guess`" \ - $(ENABLE_SHARED_OR_STATIC) \ + --enable-static --disable-shared \ --prefix='$(PREFIX)/$(TARGET)' \ --disable-nls \ --disable-guile \ @@ -40,8 +40,30 @@ ac_cv_prog_AR='$(TARGET)-ar' $(MAKE) -C '$(1)' -j '$(JOBS)' install - '$(TARGET)-gcc' \ - -W -Wall -Werror -ansi -pedantic \ - '$(2).c' -o '$(PREFIX)/$(TARGET)/bin/test-gnutls.exe' \ - `'$(TARGET)-pkg-config' gnutls --cflags --libs` + if [ $(BUILD_SHARED) = yes ]; then \ + $(INSTALL) -d '$(PREFIX)/$(TARGET)/bin'; \ + \ + $(MAKE_SHARED_FROM_STATIC) --ar '$(TARGET)-ar' --ld '$(TARGET)-gcc' '$(PREFIX)/$(TARGET)/lib/libgnutls.a'; \ + $(INSTALL) -m755 '$(PREFIX)/$(TARGET)/lib/libgnutls.dll.a' '$(PREFIX)/$(TARGET)/lib/libgnutls.dll.a'; \ + $(INSTALL) -m755 '$(PREFIX)/$(TARGET)/lib/libgnutls.dll' '$(PREFIX)/$(TARGET)/bin/libgnutls.dll'; \ + rm -f '$(PREFIX)/$(TARGET)/lib/libgnutls.dll'; \ + rm -f '$(PREFIX)/$(TARGET)/lib/libgnutls.la'; \ + \ + $(MAKE_SHARED_FROM_STATIC) --ar '$(TARGET)-ar' --ld '$(TARGET)-g++' '$(PREFIX)/$(TARGET)/lib/libgnutlsxx.a'; \ + $(INSTALL) -m755 '$(PREFIX)/$(TARGET)/lib/libgnutlsxx.dll.a' '$(PREFIX)/$(TARGET)/lib/libgnutlsxx.dll.a'; \ + $(INSTALL) -m755 '$(PREFIX)/$(TARGET)/lib/libgnutlsxx.dll' '$(PREFIX)/$(TARGET)/bin/libgnutlsxx.dll'; \ + rm -f '$(PREFIX)/$(TARGET)/lib/libgnutlsxx.dll'; \ + rm -f '$(PREFIX)/$(TARGET)/lib/libgnutlsxx.la'; \ + \ + $(MAKE_SHARED_FROM_STATIC) --ar '$(TARGET)-ar' --ld '$(TARGET)-g++' '$(PREFIX)/$(TARGET)/lib/libgnutls-openssl.a'; \ + $(INSTALL) -m755 '$(PREFIX)/$(TARGET)/lib/libgnutls-openssl.dll.a' '$(PREFIX)/$(TARGET)/lib/libgnutls-openssl.dll.a'; \ + $(INSTALL) -m755 '$(PREFIX)/$(TARGET)/lib/libgnutls-openssl.dll' '$(PREFIX)/$(TARGET)/bin/libgnutls-openssl.dll'; \ + rm -f '$(PREFIX)/$(TARGET)/lib/libgnutls-openssl.dll'; \ + rm -f '$(PREFIX)/$(TARGET)/lib/libgnutls-openssl.la'; \ + fi + +## '$(TARGET)-gcc' \ +## -W -Wall -Werror -ansi -pedantic \ +## '$(2).c' -o '$(PREFIX)/$(TARGET)/bin/test-gnutls.exe' \ +## `'$(TARGET)-pkg-config' gnutls --cflags --libs` endef