From b2892f101216c724602b332fbd28b1948f843ff4 Mon Sep 17 00:00:00 2001 From: Mark Brand Date: Sun, 2 Jun 2013 16:49:31 +0200 Subject: remove explicit configure option --libdir Unsetting CONFIG_SITE was the right way to solve the problem that --libdir was working around. This reverts commit 0b3240f9d8c74205cf128e9a7f865f22dbd6e771. This reverts commit 3653eb6ec1ba0f178e4ab39d7e9b72acb36298e9. This reverts commit 593ab5a7068d6142903ab839237100e92a5071f3. --- src/dbus.mk | 1 - src/expat.mk | 3 +-- src/fontconfig.mk | 1 - src/freetds.mk | 1 - src/freetype.mk | 3 +-- src/gettext.mk | 1 - src/gmp.mk | 1 - src/gnutls.mk | 1 - src/gsoap.mk | 1 - src/icu4c.mk | 1 - src/jpeg.mk | 1 - src/lcms1.mk | 1 - src/libgcrypt.mk | 1 - src/libgpg_error.mk | 1 - src/libgsasl.mk | 1 - src/libiconv.mk | 1 - src/libidn.mk | 1 - src/libntlm.mk | 3 +-- src/libodbc++.mk | 1 - src/libpng.mk | 3 +-- src/nettle.mk | 3 +-- src/pcre.mk | 1 - src/postgresql.mk | 1 - src/sqlite.mk | 1 - src/tiff.mk | 1 - src/winpthreads.mk | 1 - src/xz.mk | 1 - 27 files changed, 5 insertions(+), 32 deletions(-) diff --git a/src/dbus.mk b/src/dbus.mk index 63bfab6..0e8ac35 100644 --- a/src/dbus.mk +++ b/src/dbus.mk @@ -21,7 +21,6 @@ define $(PKG)_BUILD --host='$(TARGET)' \ --build="`config.guess`" \ --prefix='$(PREFIX)/$(TARGET)' \ - --libdir='$(PREFIX)/$(TARGET)/lib' \ --with-xml=expat \ --disable-tests \ --disable-verbose-mode \ diff --git a/src/expat.mk b/src/expat.mk index 03393b7..c006013 100644 --- a/src/expat.mk +++ b/src/expat.mk @@ -19,7 +19,6 @@ define $(PKG)_BUILD cd '$(1)' && ./configure \ --host='$(TARGET)' \ --disable-shared \ - --prefix='$(PREFIX)/$(TARGET)' \ - --libdir='$(PREFIX)/$(TARGET)/lib' + --prefix='$(PREFIX)/$(TARGET)' $(MAKE) -C '$(1)' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= endef diff --git a/src/fontconfig.mk b/src/fontconfig.mk index ad3b33b..ca1ca94 100644 --- a/src/fontconfig.mk +++ b/src/fontconfig.mk @@ -22,7 +22,6 @@ define $(PKG)_BUILD --build="`config.guess`" \ --disable-shared \ --prefix='$(PREFIX)/$(TARGET)' \ - --libdir='$(PREFIX)/$(TARGET)/lib' \ --with-arch='$(TARGET)' \ --with-expat='$(PREFIX)/$(TARGET)' \ --disable-docs diff --git a/src/freetds.mk b/src/freetds.mk index 911ffe6..6010cef 100644 --- a/src/freetds.mk +++ b/src/freetds.mk @@ -24,7 +24,6 @@ endef define $(PKG)_BUILD cd '$(1)' && ./configure \ --prefix='$(PREFIX)/$(TARGET)' \ - --libdir='$(PREFIX)/$(TARGET)/lib' \ --host='$(TARGET)' \ --build="`config.guess`" \ --disable-rpath \ diff --git a/src/freetype.mk b/src/freetype.mk index 2b77dfd..b02ee50 100644 --- a/src/freetype.mk +++ b/src/freetype.mk @@ -20,8 +20,7 @@ define $(PKG)_BUILD --host='$(TARGET)' \ --build="`config.guess`" \ --disable-shared \ - --prefix='$(PREFIX)/$(TARGET)' \ - --libdir='$(PREFIX)/$(TARGET)/lib' + --prefix='$(PREFIX)/$(TARGET)' $(MAKE) -C '$(1)' -j '$(JOBS)' $(MAKE) -C '$(1)' -j 1 install endef diff --git a/src/gettext.mk b/src/gettext.mk index 7488068..0183cd1 100644 --- a/src/gettext.mk +++ b/src/gettext.mk @@ -21,7 +21,6 @@ define $(PKG)_BUILD --host='$(TARGET)' \ --disable-shared \ --prefix='$(PREFIX)/$(TARGET)' \ - --libdir='$(PREFIX)/$(TARGET)/lib' \ --enable-threads=win32 \ --without-libexpat-prefix \ --without-libxml2-prefix \ diff --git a/src/gmp.mk b/src/gmp.mk index 14076ef..9c3bde5 100644 --- a/src/gmp.mk +++ b/src/gmp.mk @@ -23,7 +23,6 @@ define $(PKG)_BUILD --host='$(TARGET)' \ --build="`config.guess`" \ --prefix='$(PREFIX)/$(TARGET)' \ - --libdir='$(PREFIX)/$(TARGET)/lib' \ --disable-shared \ --enable-cxx \ --without-readline diff --git a/src/gnutls.mk b/src/gnutls.mk index ef5ab08..1dfa8b9 100644 --- a/src/gnutls.mk +++ b/src/gnutls.mk @@ -30,7 +30,6 @@ define $(PKG)_BUILD --enable-static \ --disable-shared \ --prefix='$(PREFIX)/$(TARGET)' \ - --libdir='$(PREFIX)/$(TARGET)/lib' \ --disable-rpath \ --disable-nls \ --disable-guile \ diff --git a/src/gsoap.mk b/src/gsoap.mk index d6bb864..3ca54b7 100644 --- a/src/gsoap.mk +++ b/src/gsoap.mk @@ -40,7 +40,6 @@ define $(PKG)_BUILD # http://groups.google.com/group/ikarus-users/browse_thread/thread/fd1d101eac32633f cd '$(1)' && ac_cv_func_malloc_0_nonnull=yes ./configure \ --prefix='$(PREFIX)/$(TARGET)' \ - --libdir='$(PREFIX)/$(TARGET)/lib' \ --host='$(TARGET)' \ --build="`config.guess`" \ --enable-gnutls \ diff --git a/src/icu4c.mk b/src/icu4c.mk index 5bcc0a1..81bbc1d 100644 --- a/src/icu4c.mk +++ b/src/icu4c.mk @@ -23,7 +23,6 @@ define $(PKG)_BUILD --host='$(TARGET)' \ --build="`config.guess`" \ --prefix='$(PREFIX)/$(TARGET)' \ - --libdir='$(PREFIX)/$(TARGET)/lib' \ --enable-static \ --disable-shared \ --with-cross-build='$(1).native' \ diff --git a/src/jpeg.mk b/src/jpeg.mk index 244b7ba..cd9e33d 100644 --- a/src/jpeg.mk +++ b/src/jpeg.mk @@ -18,7 +18,6 @@ endef define $(PKG)_BUILD cd '$(1)' && ./configure \ --prefix='$(PREFIX)/$(TARGET)' \ - --libdir='$(PREFIX)/$(TARGET)/lib' \ --host='$(TARGET)' \ --disable-shared $(MAKE) -C '$(1)' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= man_MANS= diff --git a/src/lcms1.mk b/src/lcms1.mk index 38e1b5d..0ba84ed 100644 --- a/src/lcms1.mk +++ b/src/lcms1.mk @@ -19,7 +19,6 @@ endef define $(PKG)_BUILD cd '$(1)' && ./configure \ --prefix='$(PREFIX)/$(TARGET)' \ - --libdir='$(PREFIX)/$(TARGET)/lib' \ --host='$(TARGET)' \ --build="`config.guess`" \ --disable-shared \ diff --git a/src/libgcrypt.mk b/src/libgcrypt.mk index 5c12611..0ef9254 100644 --- a/src/libgcrypt.mk +++ b/src/libgcrypt.mk @@ -22,7 +22,6 @@ define $(PKG)_CONFIGURE --build="`config.guess`" \ --disable-shared \ --prefix='$(PREFIX)/$(TARGET)' \ - --libdir='$(PREFIX)/$(TARGET)/lib' \ --with-gpg-error-prefix='$(PREFIX)/$(TARGET)' endef diff --git a/src/libgpg_error.mk b/src/libgpg_error.mk index 36565d4..f18ad33 100644 --- a/src/libgpg_error.mk +++ b/src/libgpg_error.mk @@ -21,7 +21,6 @@ define $(PKG)_BUILD --build="`config.guess`" \ --disable-shared \ --prefix='$(PREFIX)/$(TARGET)' \ - --libdir='$(PREFIX)/$(TARGET)/lib' \ --disable-nls \ --disable-languages $(MAKE) -C '$(1)/src' -j '$(JOBS)' bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= diff --git a/src/libgsasl.mk b/src/libgsasl.mk index 477fea6..e2f62a9 100644 --- a/src/libgsasl.mk +++ b/src/libgsasl.mk @@ -22,7 +22,6 @@ define $(PKG)_BUILD --build="`config.guess`" \ --disable-shared \ --prefix='$(PREFIX)/$(TARGET)' \ - --libdir='$(PREFIX)/$(TARGET)/lib' \ --disable-nls \ --with-libgcrypt \ --with-libiconv-prefix='$(PREFIX)/$(TARGET)' \ diff --git a/src/libiconv.mk b/src/libiconv.mk index f5d1b03..b4393d0 100644 --- a/src/libiconv.mk +++ b/src/libiconv.mk @@ -21,7 +21,6 @@ define $(PKG)_BUILD cd '$(1)' && ./configure \ --host='$(TARGET)' \ --prefix='$(PREFIX)/$(TARGET)' \ - --libdir='$(PREFIX)/$(TARGET)/lib' \ --disable-shared \ --disable-nls $(MAKE) -C '$(1)/libcharset' -j '$(JOBS)' install diff --git a/src/libidn.mk b/src/libidn.mk index 9806a06..6e0734a 100644 --- a/src/libidn.mk +++ b/src/libidn.mk @@ -23,7 +23,6 @@ define $(PKG)_BUILD --disable-shared \ --disable-csharp \ --prefix='$(PREFIX)/$(TARGET)' \ - --libdir='$(PREFIX)/$(TARGET)/lib' \ --with-libiconv-prefix='$(PREFIX)/$(TARGET)' $(MAKE) -C '$(1)' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= diff --git a/src/libntlm.mk b/src/libntlm.mk index 0ebbdc4..daa167a 100644 --- a/src/libntlm.mk +++ b/src/libntlm.mk @@ -21,7 +21,6 @@ define $(PKG)_BUILD --host='$(TARGET)' \ --build="`config.guess`" \ --disable-shared \ - --prefix='$(PREFIX)/$(TARGET)' \ - --libdir='$(PREFIX)/$(TARGET)/lib' + --prefix='$(PREFIX)/$(TARGET)' $(MAKE) -C '$(1)' -j 1 install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= endef diff --git a/src/libodbc++.mk b/src/libodbc++.mk index 0f4acff..4fb729e 100644 --- a/src/libodbc++.mk +++ b/src/libodbc++.mk @@ -23,7 +23,6 @@ define $(PKG)_BUILD touch '$(1)/config.h.in' cd '$(1)' && ./configure \ --prefix='$(PREFIX)/$(TARGET)' \ - --libdir='$(PREFIX)/$(TARGET)/lib' \ --host='$(TARGET)' \ --disable-shared \ --without-tests \ diff --git a/src/libpng.mk b/src/libpng.mk index 21fc46b..db45f80 100644 --- a/src/libpng.mk +++ b/src/libpng.mk @@ -25,8 +25,7 @@ define $(PKG)_BUILD --host='$(TARGET)' \ --build="`config.guess`" \ --disable-shared \ - --prefix='$(PREFIX)/$(TARGET)' \ - --libdir='$(PREFIX)/$(TARGET)/lib' + --prefix='$(PREFIX)/$(TARGET)' $(MAKE) -C '$(1)' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= '$(TARGET)-gcc' \ diff --git a/src/nettle.mk b/src/nettle.mk index 7bd81a8..d031dae 100644 --- a/src/nettle.mk +++ b/src/nettle.mk @@ -22,8 +22,7 @@ define $(PKG)_BUILD --host='$(TARGET)' \ --build="`config.guess`" \ --disable-shared \ - --prefix='$(PREFIX)/$(TARGET)' \ - --libdir='$(PREFIX)/$(TARGET)/lib' + --prefix='$(PREFIX)/$(TARGET)' $(MAKE) -C '$(1)' -j '$(JOBS)' getopt.o getopt1.o $(MAKE) -C '$(1)' -j '$(JOBS)' install endef diff --git a/src/pcre.mk b/src/pcre.mk index 1b56113..1839988 100644 --- a/src/pcre.mk +++ b/src/pcre.mk @@ -24,7 +24,6 @@ define $(PKG)_BUILD --build="`config.guess`" \ --disable-shared \ --prefix='$(PREFIX)/$(TARGET)' \ - --libdir='$(PREFIX)/$(TARGET)/lib' \ --enable-pcre16 \ --enable-utf \ --enable-unicode-properties \ diff --git a/src/postgresql.mk b/src/postgresql.mk index 6b4824e..6434f2f 100644 --- a/src/postgresql.mk +++ b/src/postgresql.mk @@ -24,7 +24,6 @@ define $(PKG)_BUILD # Since we build only client libary, use bogus tzdata to satisfy configure. cd '$(1)' && ./configure \ --prefix='$(PREFIX)/$(TARGET)' \ - --libdir='$(PREFIX)/$(TARGET)/lib' \ --host='$(TARGET)' \ --build="`config.guess`" \ --disable-shared \ diff --git a/src/sqlite.mk b/src/sqlite.mk index a5957a1..fced0e7 100644 --- a/src/sqlite.mk +++ b/src/sqlite.mk @@ -21,7 +21,6 @@ define $(PKG)_BUILD --build="`config.guess`" \ --disable-shared \ --prefix='$(PREFIX)/$(TARGET)' \ - --libdir='$(PREFIX)/$(TARGET)/lib' \ --disable-readline \ --disable-threadsafe $(MAKE) -C '$(1)' -j '$(JOBS)' install diff --git a/src/tiff.mk b/src/tiff.mk index ed34906..d7a3d25 100644 --- a/src/tiff.mk +++ b/src/tiff.mk @@ -22,7 +22,6 @@ define $(PKG)_BUILD --build="`config.guess`" \ --disable-shared \ --prefix='$(PREFIX)/$(TARGET)' \ - --libdir='$(PREFIX)/$(TARGET)/lib' \ --without-x $(MAKE) -C '$(1)' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= endef diff --git a/src/winpthreads.mk b/src/winpthreads.mk index 01fb348..ba2d132 100644 --- a/src/winpthreads.mk +++ b/src/winpthreads.mk @@ -17,7 +17,6 @@ define $(PKG)_BUILD_mingw-w64 cd '$(1)/mingw-w64-libraries/winpthreads' && ./configure \ --host='$(TARGET)' \ --prefix='$(PREFIX)/$(TARGET)' \ - --libdir='$(PREFIX)/$(TARGET)/lib' --enable-static \ --disable-shared $(MAKE) -C '$(1)/mingw-w64-libraries/winpthreads' -j '$(JOBS)' install diff --git a/src/xz.mk b/src/xz.mk index 176686d..7cfc628 100644 --- a/src/xz.mk +++ b/src/xz.mk @@ -20,7 +20,6 @@ define $(PKG)_BUILD --host='$(TARGET)' \ --build="`config.guess`" \ --prefix='$(PREFIX)/$(TARGET)' \ - --libdir='$(PREFIX)/$(TARGET)/lib' \ --disable-shared \ --disable-threads \ --disable-nls -- cgit v0.12