# HG changeset patch # User John W. Eaton # Date 1353013905 18000 # Node ID 47558e95811379225519cac12a36fce8f6cfa451 # Parent 54522aaf400ca1780874d573c07a95ce495d910c Allow static/shared libraries to be configured in top-level Makefile. diff -r 54522aaf400c -r 47558e958113 Makefile --- a/Makefile Wed Nov 14 10:53:53 2012 +0100 +++ b/Makefile Thu Nov 15 16:11:45 2012 -0500 @@ -1,6 +1,24 @@ # This file is part of MXE. # See index.html for further information. +# Enable shared or static libs, or perhaps both. At least one +# package uses --with instead of --enable. Probably it doesn't +# make sense to disable both... +BUILD_SHARED := no +BUILD_STATIC := yes +ifeq ($(BUILD_SHARED),yes) + ifeq ($(BUILD_STATIC),yes) + ENABLE_SHARED_OR_STATIC := --enable-shared --enable-static + WITH_SHARED_OR_STATIC := --with-shared --with-static + else + ENABLE_SHARED_OR_STATIC := --enable-shared --disable-static + WITH_SHARED_OR_STATIC := --with-shared --without-static + endif +else + ENABLE_SHARED_OR_STATIC := --disable-shared --enable-static + WITH_SHARED_OR_STATIC := --without-shared --with-static +endif + JOBS := 1 TARGET := i686-pc-mingw32 SOURCEFORGE_MIRROR := freefr.dl.sourceforge.net diff -r 54522aaf400c -r 47558e958113 src/agg.mk --- a/src/agg.mk Wed Nov 14 10:53:53 2012 +0100 +++ b/src/agg.mk Thu Nov 15 16:11:45 2012 -0500 @@ -21,7 +21,7 @@ cd '$(1)' && $(SHELL) ./autogen.sh \ --host='$(TARGET)' \ --build="`config.guess`" \ - --disable-shared \ + $(ENABLE_SHARED_OR_STATIC) \ --prefix='$(PREFIX)/$(TARGET)' \ --without-x $(MAKE) -C '$(1)' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= diff -r 54522aaf400c -r 47558e958113 src/apr-util.mk --- a/src/apr-util.mk Wed Nov 14 10:53:53 2012 +0100 +++ b/src/apr-util.mk Thu Nov 15 16:11:45 2012 -0500 @@ -21,8 +21,7 @@ --prefix='$(PREFIX)/$(TARGET)' \ --host='$(TARGET)' \ --build="`config.guess`" \ - --disable-shared \ - --enable-static \ + $(ENABLE_SHARED_OR_STATIC) \ --without-pgsql \ --without-sqlite2 \ --without-sqlite3 \ diff -r 54522aaf400c -r 47558e958113 src/apr.mk --- a/src/apr.mk Wed Nov 14 10:53:53 2012 +0100 +++ b/src/apr.mk Thu Nov 15 16:11:45 2012 -0500 @@ -21,8 +21,7 @@ --prefix='$(PREFIX)/$(TARGET)' \ --host='$(TARGET)' \ --build="`config.guess`" \ - --disable-shared \ - --enable-static \ + $(ENABLE_SHARED_OR_STATIC) \ ac_cv_sizeof_off_t=4 \ ac_cv_sizeof_pid_t=4 \ ac_cv_sizeof_size_t=4 \ diff -r 54522aaf400c -r 47558e958113 src/atk.mk --- a/src/atk.mk Wed Nov 14 10:53:53 2012 +0100 +++ b/src/atk.mk Thu Nov 15 16:11:45 2012 -0500 @@ -21,7 +21,7 @@ cd '$(1)' && ./configure \ --host='$(TARGET)' \ --build="`config.guess`" \ - --disable-shared \ + $(ENABLE_SHARED_OR_STATIC) \ --prefix='$(PREFIX)/$(TARGET)' \ --disable-glibtest \ --disable-gtk-doc diff -r 54522aaf400c -r 47558e958113 src/atkmm.mk --- a/src/atkmm.mk Wed Nov 14 10:53:53 2012 +0100 +++ b/src/atkmm.mk Thu Nov 15 16:11:45 2012 -0500 @@ -19,7 +19,7 @@ define $(PKG)_BUILD cd '$(1)' && ./configure \ --host='$(TARGET)' \ - --disable-shared \ + $(ENABLE_SHARED_OR_STATIC) \ --prefix='$(PREFIX)/$(TARGET)' \ MAKE=$(MAKE) $(MAKE) -C '$(1)' -j '$(JOBS)' bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= diff -r 54522aaf400c -r 47558e958113 src/aubio.mk --- a/src/aubio.mk Wed Nov 14 10:53:53 2012 +0100 +++ b/src/aubio.mk Thu Nov 15 16:11:45 2012 -0500 @@ -19,7 +19,7 @@ cd '$(1)' && autoconf cd '$(1)' && ./configure \ --host='$(TARGET)' \ - --disable-shared \ + $(ENABLE_SHARED_OR_STATIC) \ --disable-jack \ --prefix='$(PREFIX)/$(TARGET)' \ PYTHON='no' diff -r 54522aaf400c -r 47558e958113 src/bfd.mk --- a/src/bfd.mk Wed Nov 14 10:53:53 2012 +0100 +++ b/src/bfd.mk Thu Nov 15 16:11:45 2012 -0500 @@ -20,7 +20,7 @@ --target='$(TARGET)' \ --prefix='$(PREFIX)/$(TARGET)' \ --enable-install-libbfd \ - --disable-shared + $(ENABLE_SHARED_OR_STATIC) $(MAKE) -C '$(1)/bfd' -j '$(JOBS)' $(MAKE) -C '$(1)/bfd' -j 1 install endef diff -r 54522aaf400c -r 47558e958113 src/binutils.mk --- a/src/binutils.mk Wed Nov 14 10:53:53 2012 +0100 +++ b/src/binutils.mk Thu Nov 15 16:11:45 2012 -0500 @@ -34,7 +34,7 @@ --with-gnu-ld \ --with-gnu-as \ --disable-nls \ - --disable-shared \ + $(ENABLE_SHARED_OR_STATIC) \ --disable-werror $(MAKE) -C '$(1)' -j '$(JOBS)' $(MAKE) -C '$(1)' -j 1 install diff -r 54522aaf400c -r 47558e958113 src/cairo.mk --- a/src/cairo.mk Wed Nov 14 10:53:53 2012 +0100 +++ b/src/cairo.mk Thu Nov 15 16:11:45 2012 -0500 @@ -21,7 +21,7 @@ cd '$(1)' && ./configure \ --host='$(TARGET)' \ --build="`config.guess`" \ - --disable-shared \ + $(ENABLE_SHARED_OR_STATIC) \ --prefix='$(PREFIX)/$(TARGET)' \ --disable-gtk-doc \ --disable-test-surfaces \ diff -r 54522aaf400c -r 47558e958113 src/cairomm.mk --- a/src/cairomm.mk Wed Nov 14 10:53:53 2012 +0100 +++ b/src/cairomm.mk Thu Nov 15 16:11:45 2012 -0500 @@ -19,7 +19,7 @@ define $(PKG)_BUILD cd '$(1)' && ./configure \ --host='$(TARGET)' \ - --disable-shared \ + $(ENABLE_SHARED_OR_STATIC) \ --prefix='$(PREFIX)/$(TARGET)' \ MAKE=$(MAKE) $(MAKE) -C '$(1)' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= diff -r 54522aaf400c -r 47558e958113 src/cppunit.mk --- a/src/cppunit.mk Wed Nov 14 10:53:53 2012 +0100 +++ b/src/cppunit.mk Thu Nov 15 16:11:45 2012 -0500 @@ -18,7 +18,7 @@ define $(PKG)_BUILD cd '$(1)' && ./configure \ --host='$(TARGET)' \ - --disable-shared \ + $(ENABLE_SHARED_OR_STATIC) \ --prefix='$(PREFIX)/$(TARGET)' \ --disable-doxygen \ --disable-dot \ diff -r 54522aaf400c -r 47558e958113 src/cunit.mk --- a/src/cunit.mk Wed Nov 14 10:53:53 2012 +0100 +++ b/src/cunit.mk Thu Nov 15 16:11:45 2012 -0500 @@ -18,7 +18,7 @@ define $(PKG)_BUILD cd '$(1)' && ./configure \ --host='$(TARGET)' \ - --disable-shared \ + $(ENABLE_SHARED_OR_STATIC) \ --prefix='$(PREFIX)/$(TARGET)' $(MAKE) -C '$(1)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= defexec_DATA= endef diff -r 54522aaf400c -r 47558e958113 src/curl.mk --- a/src/curl.mk Wed Nov 14 10:53:53 2012 +0100 +++ b/src/curl.mk Thu Nov 15 16:11:45 2012 -0500 @@ -19,7 +19,7 @@ cd '$(1)' && ./configure \ --host='$(TARGET)' \ --build="`config.guess`" \ - --disable-shared \ + $(ENABLE_SHARED_OR_STATIC) \ --prefix='$(PREFIX)/$(TARGET)' \ --with-gnutls \ --with-libidn \ diff -r 54522aaf400c -r 47558e958113 src/dbus.mk --- a/src/dbus.mk Wed Nov 14 10:53:53 2012 +0100 +++ b/src/dbus.mk Thu Nov 15 16:11:45 2012 -0500 @@ -25,9 +25,8 @@ --disable-tests \ --disable-verbose-mode \ --disable-asserts \ - --disable-shared \ + $(ENABLE_SHARED_OR_STATIC) \ --disable-maintainer-mode \ - --enable-static \ --disable-silent-rules $(MAKE) -C '$(1)' -j '$(JOBS)' install endef diff -r 54522aaf400c -r 47558e958113 src/devil.mk --- a/src/devil.mk Wed Nov 14 10:53:53 2012 +0100 +++ b/src/devil.mk Thu Nov 15 16:11:45 2012 -0500 @@ -21,7 +21,7 @@ cd '$(1)' && ./configure \ --host='$(TARGET)' \ --build="`config.guess`" \ - --disable-shared \ + $(ENABLE_SHARED_OR_STATIC) \ --prefix='$(PREFIX)/$(TARGET)' \ --enable-ILU \ --enable-ILUT \ diff -r 54522aaf400c -r 47558e958113 src/exiv2.mk --- a/src/exiv2.mk Wed Nov 14 10:53:53 2012 +0100 +++ b/src/exiv2.mk Thu Nov 15 16:11:45 2012 -0500 @@ -20,7 +20,7 @@ cd '$(1)' && ./configure \ --host='$(TARGET)' \ --build="`config.guess`" \ - --disable-shared \ + $(ENABLE_SHARED_OR_STATIC) \ --prefix='$(PREFIX)/$(TARGET)' \ --disable-visibility \ --disable-nls \ diff -r 54522aaf400c -r 47558e958113 src/expat.mk --- a/src/expat.mk Wed Nov 14 10:53:53 2012 +0100 +++ b/src/expat.mk Thu Nov 15 16:11:45 2012 -0500 @@ -18,7 +18,7 @@ define $(PKG)_BUILD cd '$(1)' && ./configure \ --host='$(TARGET)' \ - --disable-shared \ + $(ENABLE_SHARED_OR_STATIC) \ --prefix='$(PREFIX)/$(TARGET)' $(MAKE) -C '$(1)' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= endef diff -r 54522aaf400c -r 47558e958113 src/faad2.mk --- a/src/faad2.mk Wed Nov 14 10:53:53 2012 +0100 +++ b/src/faad2.mk Thu Nov 15 16:11:45 2012 -0500 @@ -19,7 +19,7 @@ cd '$(1)' && ./configure \ --host='$(TARGET)' \ --prefix='$(PREFIX)/$(TARGET)' \ - --disable-shared + $(ENABLE_SHARED_OR_STATIC) $(MAKE) -C '$(1)' -j '$(JOBS)' $(MAKE) -C '$(1)' -j 1 install endef diff -r 54522aaf400c -r 47558e958113 src/ffmpeg.mk --- a/src/ffmpeg.mk Wed Nov 14 10:53:53 2012 +0100 +++ b/src/ffmpeg.mk Thu Nov 15 16:11:45 2012 -0500 @@ -24,7 +24,7 @@ --arch=i686 \ --target-os=mingw32 \ --prefix='$(PREFIX)/$(TARGET)' \ - --disable-shared \ + $(ENABLE_SHARED_OR_STATIC) \ --disable-debug \ --disable-doc \ --enable-memalign-hack \ diff -r 54522aaf400c -r 47558e958113 src/fftw.mk --- a/src/fftw.mk Wed Nov 14 10:53:53 2012 +0100 +++ b/src/fftw.mk Thu Nov 15 16:11:45 2012 -0500 @@ -21,7 +21,7 @@ cd '$(1)' && ./configure \ --host='$(TARGET)' \ --build="`config.guess`" \ - --disable-shared \ + $(ENABLE_SHARED_OR_STATIC) \ --prefix='$(PREFIX)/$(TARGET)' \ --enable-threads \ --enable-double @@ -31,7 +31,7 @@ cd '$(1)' && ./configure \ --host='$(TARGET)' \ --build="`config.guess`" \ - --disable-shared \ + $(ENABLE_SHARED_OR_STATIC) \ --prefix='$(PREFIX)/$(TARGET)' \ --enable-threads \ --enable-long-double @@ -41,7 +41,7 @@ cd '$(1)' && ./configure \ --host='$(TARGET)' \ --build="`config.guess`" \ - --disable-shared \ + $(ENABLE_SHARED_OR_STATIC) \ --prefix='$(PREFIX)/$(TARGET)' \ --enable-threads \ --enable-float diff -r 54522aaf400c -r 47558e958113 src/file.mk --- a/src/file.mk Wed Nov 14 10:53:53 2012 +0100 +++ b/src/file.mk Thu Nov 15 16:11:45 2012 -0500 @@ -23,13 +23,13 @@ cp -Rp '$(1)' '$(1).native' cd '$(1).native' && ./configure \ - --disable-shared + $(ENABLE_SHARED_OR_STATIC) $(MAKE) -C '$(1).native/src' -j '$(JOBS)' file cd '$(1)' && ./configure \ --host='$(TARGET)' \ --build="`config.guess`" \ - --disable-shared \ + $(ENABLE_SHARED_OR_STATIC) \ --prefix='$(PREFIX)/$(TARGET)' $(MAKE) -C '$(1)' -j '$(JOBS)' bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= man_MANS= FILE_COMPILE='$(1).native/src/file' $(MAKE) -C '$(1)' -j 1 install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= man_MANS= diff -r 54522aaf400c -r 47558e958113 src/flac.mk --- a/src/flac.mk Wed Nov 14 10:53:53 2012 +0100 +++ b/src/flac.mk Thu Nov 15 16:11:45 2012 -0500 @@ -20,7 +20,7 @@ define $(PKG)_BUILD cd '$(1)' && ./configure \ --host='$(TARGET)' \ - --disable-shared \ + $(ENABLE_SHARED_OR_STATIC) \ --prefix='$(PREFIX)/$(TARGET)' \ --disable-doxygen-docs \ --disable-xmms-plugin \ diff -r 54522aaf400c -r 47558e958113 src/fltk.mk --- a/src/fltk.mk Wed Nov 14 10:53:53 2012 +0100 +++ b/src/fltk.mk Thu Nov 15 16:11:45 2012 -0500 @@ -22,7 +22,7 @@ cd '$(1)' && ./configure \ --host='$(TARGET)' \ --build="`config.guess`" \ - --disable-shared \ + $(ENABLE_SHARED_OR_STATIC) \ --prefix='$(PREFIX)/$(TARGET)' \ --enable-threads \ LIBS='-lws2_32' diff -r 54522aaf400c -r 47558e958113 src/fontconfig.mk --- a/src/fontconfig.mk Wed Nov 14 10:53:53 2012 +0100 +++ b/src/fontconfig.mk Thu Nov 15 16:11:45 2012 -0500 @@ -19,7 +19,7 @@ cd '$(1)' && ./configure \ --host='$(TARGET)' \ --build="`config.guess`" \ - --disable-shared \ + $(ENABLE_SHARED_OR_STATIC) \ --prefix='$(PREFIX)/$(TARGET)' \ --with-arch='$(TARGET)' \ --with-expat='$(PREFIX)/$(TARGET)' diff -r 54522aaf400c -r 47558e958113 src/freeglut.mk --- a/src/freeglut.mk Wed Nov 14 10:53:53 2012 +0100 +++ b/src/freeglut.mk Thu Nov 15 16:11:45 2012 -0500 @@ -19,7 +19,7 @@ cd '$(1)' && ./autogen.sh cd '$(1)' && ./configure \ --host='$(TARGET)' \ - --disable-shared \ + $(ENABLE_SHARED_OR_STATIC) \ --prefix='$(PREFIX)/$(TARGET)' \ --enable-replace-glut \ --disable-debug \ diff -r 54522aaf400c -r 47558e958113 src/freetds.mk --- a/src/freetds.mk Wed Nov 14 10:53:53 2012 +0100 +++ b/src/freetds.mk Thu Nov 15 16:11:45 2012 -0500 @@ -28,8 +28,7 @@ --build="`config.guess`" \ --disable-rpath \ --disable-dependency-tracking \ - --disable-shared \ - --enable-static \ + $(ENABLE_SHARED_OR_STATIC) \ --enable-libiconv \ --enable-msdblib \ --enable-sspi \ diff -r 54522aaf400c -r 47558e958113 src/freetype.mk --- a/src/freetype.mk Wed Nov 14 10:53:53 2012 +0100 +++ b/src/freetype.mk Thu Nov 15 16:11:45 2012 -0500 @@ -19,7 +19,7 @@ cd '$(1)' && GNUMAKE=$(MAKE) ./configure \ --host='$(TARGET)' \ --build="`config.guess`" \ - --disable-shared \ + $(ENABLE_SHARED_OR_STATIC) \ --prefix='$(PREFIX)/$(TARGET)' $(MAKE) -C '$(1)' -j '$(JOBS)' install endef diff -r 54522aaf400c -r 47558e958113 src/fribidi.mk --- a/src/fribidi.mk Wed Nov 14 10:53:53 2012 +0100 +++ b/src/fribidi.mk Thu Nov 15 16:11:45 2012 -0500 @@ -20,7 +20,7 @@ cd '$(1)' && ./configure \ --host='$(TARGET)' \ --build="`config.guess`" \ - --disable-shared \ + $(ENABLE_SHARED_OR_STATIC) \ --prefix='$(PREFIX)/$(TARGET)' \ --disable-debug \ --disable-deprecated \ diff -r 54522aaf400c -r 47558e958113 src/ftgl.mk --- a/src/ftgl.mk Wed Nov 14 10:53:53 2012 +0100 +++ b/src/ftgl.mk Thu Nov 15 16:11:45 2012 -0500 @@ -22,7 +22,7 @@ cd '$(1)' && autoconf cd '$(1)' && ./configure \ --host='$(TARGET)' \ - --disable-shared \ + $(ENABLE_SHARED_OR_STATIC) \ --prefix='$(PREFIX)/$(TARGET)' \ --without-x \ --disable-freetypetest \ diff -r 54522aaf400c -r 47558e958113 src/gc.mk --- a/src/gc.mk Wed Nov 14 10:53:53 2012 +0100 +++ b/src/gc.mk Thu Nov 15 16:11:45 2012 -0500 @@ -22,7 +22,7 @@ --host='$(TARGET)' \ --build="`config.guess`" \ --prefix='$(PREFIX)/$(TARGET)' \ - --disable-shared \ + $(ENABLE_SHARED_OR_STATIC) \ --enable-threads=win32 \ --enable-cplusplus $(MAKE) -C '$(1)' -j '$(JOBS)' diff -r 54522aaf400c -r 47558e958113 src/gcc.mk --- a/src/gcc.mk Wed Nov 14 10:53:53 2012 +0100 +++ b/src/gcc.mk Thu Nov 15 16:11:45 2012 -0500 @@ -9,6 +9,9 @@ $(PKG)_URL := ftp://ftp.gnu.org/pub/gnu/gcc/gcc-$($(PKG)_VERSION)/$($(PKG)_FILE) $(PKG)_URL_2 := ftp://ftp.mirrorservice.org/sites/sourceware.org/pub/gcc/releases/gcc-$($(PKG)_VERSION)/$($(PKG)_FILE) $(PKG)_DEPS := mingwrt w32api binutils gcc-gmp gcc-mpc gcc-mpfr +ifneq ($(BUILD_SHARED),yes) +$(PKG)_STATIC_FLAG := --static +endif define $(PKG)_UPDATE $(WGET) -q -O- 'http://ftp.gnu.org/gnu/gcc/?C=M;O=D' | \ @@ -39,7 +42,7 @@ --with-gnu-ld \ --with-gnu-as \ --disable-nls \ - --disable-shared \ + $(ENABLE_SHARED_OR_STATIC) \ --disable-sjlj-exceptions \ --without-x \ --disable-win32-registry \ @@ -54,7 +57,7 @@ # create pkg-config script (echo '#!/bin/sh'; \ - echo 'PKG_CONFIG_PATH="$$PKG_CONFIG_PATH_$(subst -,_,$(TARGET))" PKG_CONFIG_LIBDIR='\''$(PREFIX)/$(TARGET)/lib/pkgconfig'\'' exec pkg-config --static "$$@"') \ + echo 'PKG_CONFIG_PATH="$$PKG_CONFIG_PATH_$(subst -,_,$(TARGET))" PKG_CONFIG_LIBDIR='\''$(PREFIX)/$(TARGET)/lib/pkgconfig'\'' exec pkg-config $($(PKG)_STATIC_FLAG)) "$$@"') \ > '$(PREFIX)/bin/$(TARGET)-pkg-config' chmod 0755 '$(PREFIX)/bin/$(TARGET)-pkg-config' @@ -62,7 +65,16 @@ [ -d '$(dir $(CMAKE_TOOLCHAIN_FILE))' ] || mkdir -p '$(dir $(CMAKE_TOOLCHAIN_FILE))' (echo 'set(CMAKE_SYSTEM_NAME Windows)'; \ echo 'set(MSYS 1)'; \ - echo 'set(BUILD_SHARED_LIBS OFF)'; \ + if [ $(BUILD_SHARED) = yes ]; then \ + echo 'set(BUILD_SHARED_LIBS ON)'; \ + else \ + echo 'set(BUILD_SHARED_LIBS OFF)'; \ + fi; \ + if [ $(BUILD_STATIC) = yes ]; then \ + echo 'set(BUILD_STATIC_LIBS ON)'; \ + else \ + echo 'set(BUILD_STATIC_LIBS OFF)'; \ + fi; \ echo 'set(CMAKE_BUILD_TYPE Release)'; \ echo 'set(CMAKE_FIND_ROOT_PATH $(PREFIX)/$(TARGET))'; \ echo 'set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)'; \ diff -r 54522aaf400c -r 47558e958113 src/gd.mk --- a/src/gd.mk Wed Nov 14 10:53:53 2012 +0100 +++ b/src/gd.mk Thu Nov 15 16:11:45 2012 -0500 @@ -29,7 +29,7 @@ $(SED) -i 's,png12,png15,g' '$(1)/configure' cd '$(1)' && ./configure \ --host='$(TARGET)' \ - --disable-shared \ + $(ENABLE_SHARED_OR_STATIC) \ --prefix='$(PREFIX)/$(TARGET)' \ --with-freetype='$(PREFIX)/$(TARGET)' \ --without-x \ diff -r 54522aaf400c -r 47558e958113 src/gdal.mk --- a/src/gdal.mk Wed Nov 14 10:53:53 2012 +0100 +++ b/src/gdal.mk Thu Nov 15 16:11:45 2012 -0500 @@ -21,7 +21,7 @@ cd '$(1)' && ./configure \ --host='$(TARGET)' \ --build="`config.guess`" \ - --disable-shared \ + $(ENABLE_SHARED_OR_STATIC) \ --prefix='$(PREFIX)/$(TARGET)' \ --with-bsb \ --with-grib \ diff -r 54522aaf400c -r 47558e958113 src/gdb.mk --- a/src/gdb.mk Wed Nov 14 10:53:53 2012 +0100 +++ b/src/gdb.mk Thu Nov 15 16:11:45 2012 -0500 @@ -21,7 +21,7 @@ cd '$(1)' && ./configure \ --host='$(TARGET)' \ --build="`config.guess`" \ - --disable-shared \ + $(ENABLE_SHARED_OR_STATIC) \ --prefix='$(PREFIX)/$(TARGET)' \ CONFIG_SHELL=$(SHELL) $(MAKE) -C '$(1)' -j '$(JOBS)' diff -r 54522aaf400c -r 47558e958113 src/gdk-pixbuf.mk --- a/src/gdk-pixbuf.mk Wed Nov 14 10:53:53 2012 +0100 +++ b/src/gdk-pixbuf.mk Thu Nov 15 16:11:45 2012 -0500 @@ -21,8 +21,7 @@ cd '$(1)' && autoreconf && ./configure \ --host='$(TARGET)' \ --build="`config.guess`" \ - --enable-static \ - --disable-shared \ + $(ENABLE_SHARED_OR_STATIC) \ --prefix='$(PREFIX)/$(TARGET)' \ --disable-modules \ --with-included-loaders \ diff -r 54522aaf400c -r 47558e958113 src/geos.mk --- a/src/geos.mk Wed Nov 14 10:53:53 2012 +0100 +++ b/src/geos.mk Thu Nov 15 16:11:45 2012 -0500 @@ -20,7 +20,7 @@ cd '$(1)' && ./configure \ --host='$(TARGET)' \ --build="`config.guess`" \ - --disable-shared \ + $(ENABLE_SHARED_OR_STATIC) \ --prefix='$(PREFIX)/$(TARGET)' $(MAKE) -C '$(1)' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= diff -r 54522aaf400c -r 47558e958113 src/gettext.mk --- a/src/gettext.mk Wed Nov 14 10:53:53 2012 +0100 +++ b/src/gettext.mk Thu Nov 15 16:11:45 2012 -0500 @@ -19,7 +19,7 @@ define $(PKG)_BUILD cd '$(1)/gettext-runtime' && ./configure \ --host='$(TARGET)' \ - --disable-shared \ + $(ENABLE_SHARED_OR_STATIC) \ --prefix='$(PREFIX)/$(TARGET)' \ --enable-threads=win32 \ --without-libexpat-prefix \ diff -r 54522aaf400c -r 47558e958113 src/giflib.mk --- a/src/giflib.mk Wed Nov 14 10:53:53 2012 +0100 +++ b/src/giflib.mk Thu Nov 15 16:11:45 2012 -0500 @@ -24,7 +24,7 @@ --host='$(TARGET)' \ --build="`config.guess`" \ --prefix='$(PREFIX)/$(TARGET)' \ - --disable-shared \ + $(ENABLE_SHARED_OR_STATIC) \ CPPFLAGS='-D_OPEN_BINARY' echo 'all:' > '$(1)/doc/Makefile' $(MAKE) -C '$(1)/lib' -j '$(JOBS)' install diff -r 54522aaf400c -r 47558e958113 src/glib.mk --- a/src/glib.mk Wed Nov 14 10:53:53 2012 +0100 +++ b/src/glib.mk Thu Nov 15 16:11:45 2012 -0500 @@ -21,13 +21,13 @@ # native build of libiconv (used by glib-genmarshal) cd '$(1).native' && $(call UNPACK_PKG_ARCHIVE,libiconv) cd '$(1).native/$(libiconv_SUBDIR)' && ./configure \ - --disable-shared \ + $(ENABLE_SHARED_OR_STATIC) \ --disable-nls $(MAKE) -C '$(1).native/$(libiconv_SUBDIR)' -j '$(JOBS)' # native build for glib-genmarshal, without pkg-config, gettext and zlib cd '$(1).native' && ./configure \ - --disable-shared \ + $(ENABLE_SHARED_OR_STATIC) \ --prefix='$(PREFIX)/$(TARGET)' \ --enable-regex \ --disable-threads \ @@ -71,7 +71,7 @@ cd '$(1)' && ./configure \ --host='$(TARGET)' \ --build="`config.guess`" \ - --disable-shared \ + $(ENABLE_SHARED_OR_STATIC) \ --prefix='$(PREFIX)/$(TARGET)' \ --with-threads=win32 \ --with-pcre=system \ diff -r 54522aaf400c -r 47558e958113 src/glibmm.mk --- a/src/glibmm.mk Wed Nov 14 10:53:53 2012 +0100 +++ b/src/glibmm.mk Thu Nov 15 16:11:45 2012 -0500 @@ -20,7 +20,7 @@ cd '$(1)' && ./configure \ --host='$(TARGET)' \ --build="`config.guess`" \ - --disable-shared \ + $(ENABLE_SHARED_OR_STATIC) \ --prefix='$(PREFIX)/$(TARGET)' \ CXX='$(TARGET)-c++' \ PKG_CONFIG='$(PREFIX)/bin/$(TARGET)-pkg-config' \ diff -r 54522aaf400c -r 47558e958113 src/gmp.mk --- a/src/gmp.mk Wed Nov 14 10:53:53 2012 +0100 +++ b/src/gmp.mk Thu Nov 15 16:11:45 2012 -0500 @@ -23,7 +23,7 @@ --host='$(TARGET)' \ --build="`config.guess`" \ --prefix='$(PREFIX)/$(TARGET)' \ - --disable-shared \ + $(ENABLE_SHARED_OR_STATIC) \ --enable-cxx \ --without-readline $(MAKE) -C '$(1)' -j '$(JOBS)' diff -r 54522aaf400c -r 47558e958113 src/gnutls.mk --- a/src/gnutls.mk Wed Nov 14 10:53:53 2012 +0100 +++ b/src/gnutls.mk Thu Nov 15 16:11:45 2012 -0500 @@ -27,8 +27,7 @@ cd '$(1)' && ./configure \ --host='$(TARGET)' \ --build="`config.guess`" \ - --enable-static \ - --disable-shared \ + $(ENABLE_SHARED_OR_STATIC) \ --prefix='$(PREFIX)/$(TARGET)' \ --disable-nls \ --disable-guile \ diff -r 54522aaf400c -r 47558e958113 src/graphicsmagick.mk --- a/src/graphicsmagick.mk Wed Nov 14 10:53:53 2012 +0100 +++ b/src/graphicsmagick.mk Thu Nov 15 16:11:45 2012 -0500 @@ -21,7 +21,7 @@ cd '$(1)' && ./configure \ --host='$(TARGET)' \ --build="`config.guess`" \ - --disable-shared \ + $(ENABLE_SHARED_OR_STATIC) \ --prefix='$(PREFIX)/$(TARGET)' \ --without-modules \ --with-threads \ diff -r 54522aaf400c -r 47558e958113 src/gsl.mk --- a/src/gsl.mk Wed Nov 14 10:53:53 2012 +0100 +++ b/src/gsl.mk Thu Nov 15 16:11:45 2012 -0500 @@ -21,8 +21,7 @@ --host='$(TARGET)' \ --build="`config.guess`" \ --prefix='$(PREFIX)/$(TARGET)' \ - --disable-shared \ - --enable-static + $(ENABLE_SHARED_OR_STATIC) $(MAKE) -C '$(1)' -j '$(JOBS)' $(MAKE) -C '$(1)' -j 1 install diff -r 54522aaf400c -r 47558e958113 src/gst-plugins-base.mk --- a/src/gst-plugins-base.mk Wed Nov 14 10:53:53 2012 +0100 +++ b/src/gst-plugins-base.mk Thu Nov 15 16:11:45 2012 -0500 @@ -23,7 +23,7 @@ --host='$(TARGET)' \ --build="`config.guess`" \ --prefix='$(PREFIX)/$(TARGET)' \ - --disable-shared \ + $(ENABLE_SHARED_OR_STATIC) \ --disable-debug \ --disable-examples \ --disable-x \ diff -r 54522aaf400c -r 47558e958113 src/gst-plugins-good.mk --- a/src/gst-plugins-good.mk Wed Nov 14 10:53:53 2012 +0100 +++ b/src/gst-plugins-good.mk Thu Nov 15 16:11:45 2012 -0500 @@ -26,7 +26,7 @@ --host='$(TARGET)' \ --build="`config.guess`" \ --prefix='$(PREFIX)/$(TARGET)' \ - --disable-shared \ + $(ENABLE_SHARED_OR_STATIC) \ --disable-debug \ --disable-examples \ --disable-aalib \ diff -r 54522aaf400c -r 47558e958113 src/gstreamer.mk --- a/src/gstreamer.mk Wed Nov 14 10:53:53 2012 +0100 +++ b/src/gstreamer.mk Thu Nov 15 16:11:45 2012 -0500 @@ -22,7 +22,7 @@ --host='$(TARGET)' \ --build="`config.guess`" \ --prefix='$(PREFIX)/$(TARGET)' \ - --disable-shared \ + $(ENABLE_SHARED_OR_STATIC) \ --disable-debug \ --disable-check \ --disable-tests \ diff -r 54522aaf400c -r 47558e958113 src/gta.mk --- a/src/gta.mk Wed Nov 14 10:53:53 2012 +0100 +++ b/src/gta.mk Thu Nov 15 16:11:45 2012 -0500 @@ -20,7 +20,7 @@ cd '$(1)' && ./configure \ --host='$(TARGET)' \ --build="`config.guess`" \ - --disable-shared \ + $(ENABLE_SHARED_OR_STATIC) \ --disable-reference \ --prefix='$(PREFIX)/$(TARGET)' $(MAKE) -C '$(1)' -j '$(JOBS)' diff -r 54522aaf400c -r 47558e958113 src/gtk2.mk --- a/src/gtk2.mk Wed Nov 14 10:53:53 2012 +0100 +++ b/src/gtk2.mk Thu Nov 15 16:11:45 2012 -0500 @@ -22,7 +22,7 @@ cd '$(1)' && ./configure \ --host='$(TARGET)' \ --build="`config.guess`" \ - --disable-shared \ + $(ENABLE_SHARED_OR_STATIC) \ --prefix='$(PREFIX)/$(TARGET)' \ --enable-explicit-deps \ --disable-glibtest \ diff -r 54522aaf400c -r 47558e958113 src/gtkglarea.mk --- a/src/gtkglarea.mk Wed Nov 14 10:53:53 2012 +0100 +++ b/src/gtkglarea.mk Thu Nov 15 16:11:45 2012 -0500 @@ -22,6 +22,6 @@ --host='$(TARGET)' \ --build="`config.guess`" \ --prefix='$(PREFIX)/$(TARGET)' \ - --disable-shared + $(ENABLE_SHARED_OR_STATIC) $(MAKE) -C '$(1)' -j '$(JOBS)' install endef diff -r 54522aaf400c -r 47558e958113 src/gtkglext.mk --- a/src/gtkglext.mk Wed Nov 14 10:53:53 2012 +0100 +++ b/src/gtkglext.mk Thu Nov 15 16:11:45 2012 -0500 @@ -23,7 +23,7 @@ --host='$(TARGET)' \ --build="`config.guess`" \ --prefix='$(PREFIX)/$(TARGET)' \ - --disable-shared \ + $(ENABLE_SHARED_OR_STATIC) \ --without-x \ --with-gdktarget=win32 \ --disable-gtk-doc \ diff -r 54522aaf400c -r 47558e958113 src/gtkglextmm.mk --- a/src/gtkglextmm.mk Wed Nov 14 10:53:53 2012 +0100 +++ b/src/gtkglextmm.mk Thu Nov 15 16:11:45 2012 -0500 @@ -22,7 +22,7 @@ --host='$(TARGET)' \ --build="`config.guess`" \ --prefix='$(PREFIX)/$(TARGET)' \ - --disable-shared + $(ENABLE_SHARED_OR_STATIC) $(MAKE) -C '$(1)' -j '$(JOBS)' install \ bin_PROGRAMS= \ sbin_PROGRAMS= \ diff -r 54522aaf400c -r 47558e958113 src/gtkmm2.mk --- a/src/gtkmm2.mk Wed Nov 14 10:53:53 2012 +0100 +++ b/src/gtkmm2.mk Thu Nov 15 16:11:45 2012 -0500 @@ -22,7 +22,7 @@ cd '$(1)' && ./configure \ --host='$(TARGET)' \ --build="`config.guess`" \ - --disable-shared \ + $(ENABLE_SHARED_OR_STATIC) \ --prefix='$(PREFIX)/$(TARGET)' \ MAKE=$(MAKE) $(MAKE) -C '$(1)' -j '$(JOBS)' bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= diff -r 54522aaf400c -r 47558e958113 src/gtksourceview.mk --- a/src/gtksourceview.mk Wed Nov 14 10:53:53 2012 +0100 +++ b/src/gtksourceview.mk Thu Nov 15 16:11:45 2012 -0500 @@ -20,7 +20,7 @@ define $(PKG)_BUILD cd '$(1)' && ./configure \ --host='$(TARGET)' \ - --disable-shared \ + $(ENABLE_SHARED_OR_STATIC) \ --prefix='$(PREFIX)/$(TARGET)' \ --disable-gtk-doc \ GLIB_GENMARSHAL='$(PREFIX)/$(TARGET)/bin/glib-genmarshal' \ diff -r 54522aaf400c -r 47558e958113 src/gtksourceviewmm2.mk --- a/src/gtksourceviewmm2.mk Wed Nov 14 10:53:53 2012 +0100 +++ b/src/gtksourceviewmm2.mk Thu Nov 15 16:11:45 2012 -0500 @@ -23,7 +23,7 @@ --host='$(TARGET)' \ --build="`config.guess`" \ --prefix='$(PREFIX)/$(TARGET)' \ - --disable-shared \ + $(ENABLE_SHARED_OR_STATIC) \ MAKE=$(MAKE) $(MAKE) -C '$(1)' -j '$(JOBS)' bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= $(MAKE) -C '$(1)' -j 1 install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= doc_install='# DISABLED: doc-install.pl' diff -r 54522aaf400c -r 47558e958113 src/guile.mk --- a/src/guile.mk Wed Nov 14 10:53:53 2012 +0100 +++ b/src/guile.mk Thu Nov 15 16:11:45 2012 -0500 @@ -24,7 +24,7 @@ --host='$(TARGET)' \ --build="`config.guess`" \ --prefix='$(PREFIX)/$(TARGET)' \ - --disable-shared \ + $(ENABLE_SHARED_OR_STATIC) \ --without-threads \ scm_cv_struct_timespec=no \ LIBS='-lunistring -lintl -liconv' \ diff -r 54522aaf400c -r 47558e958113 src/harfbuzz.mk --- a/src/harfbuzz.mk Wed Nov 14 10:53:53 2012 +0100 +++ b/src/harfbuzz.mk Thu Nov 15 16:11:45 2012 -0500 @@ -21,7 +21,6 @@ --host='$(TARGET)' \ --build="`config.guess`" \ --prefix='$(PREFIX)/$(TARGET)' \ - --disable-shared \ - --enable-static + $(ENABLE_SHARED_OR_STATIC) $(MAKE) -C '$(1)' -j '$(JOBS)' install endef diff -r 54522aaf400c -r 47558e958113 src/hunspell.mk --- a/src/hunspell.mk Wed Nov 14 10:53:53 2012 +0100 +++ b/src/hunspell.mk Thu Nov 15 16:11:45 2012 -0500 @@ -19,8 +19,7 @@ # Note: the configure file doesn't pick up pdcurses, so "ui" is disabled cd '$(1)' && ./configure \ --host='$(TARGET)' \ - --enable-static \ - --disable-shared \ + $(ENABLE_SHARED_OR_STATIC) \ --with-warnings \ --without-ui \ --with-readline \ diff -r 54522aaf400c -r 47558e958113 src/id3lib.mk --- a/src/id3lib.mk Wed Nov 14 10:53:53 2012 +0100 +++ b/src/id3lib.mk Thu Nov 15 16:11:45 2012 -0500 @@ -19,7 +19,7 @@ cd '$(1)' && autoconf cd '$(1)' && ./configure \ --host='$(TARGET)' \ - --disable-shared \ + $(ENABLE_SHARED_OR_STATIC) \ --prefix='$(PREFIX)/$(TARGET)' $(MAKE) -C '$(1)' -j '$(JOBS)' bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= $(MAKE) -C '$(1)' -j 1 install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= diff -r 54522aaf400c -r 47558e958113 src/ilmbase.mk --- a/src/ilmbase.mk Wed Nov 14 10:53:53 2012 +0100 +++ b/src/ilmbase.mk Thu Nov 15 16:11:45 2012 -0500 @@ -27,7 +27,7 @@ cd '$(1)' && $(SHELL) ./configure \ --host='$(TARGET)' \ --build="`config.guess`" \ - --disable-shared \ + $(ENABLE_SHARED_OR_STATIC) \ --prefix='$(PREFIX)/$(TARGET)' \ --disable-threading \ CONFIG_SHELL=$(SHELL) diff -r 54522aaf400c -r 47558e958113 src/imagemagick.mk --- a/src/imagemagick.mk Wed Nov 14 10:53:53 2012 +0100 +++ b/src/imagemagick.mk Thu Nov 15 16:11:45 2012 -0500 @@ -20,7 +20,7 @@ --host='$(TARGET)' \ --build="`config.guess`" \ --prefix='$(PREFIX)/$(TARGET)' \ - --disable-shared \ + $(ENABLE_SHARED_OR_STATIC) \ --with-x=no \ --without-zlib \ ac_cv_prog_freetype_config='$(PREFIX)/$(TARGET)/bin/freetype-config' diff -r 54522aaf400c -r 47558e958113 src/jasper.mk --- a/src/jasper.mk Wed Nov 14 10:53:53 2012 +0100 +++ b/src/jasper.mk Thu Nov 15 16:11:45 2012 -0500 @@ -19,7 +19,7 @@ define $(PKG)_BUILD cd '$(1)' && ./configure \ --host='$(TARGET)' \ - --disable-shared \ + $(ENABLE_SHARED_OR_STATIC) \ --prefix='$(PREFIX)/$(TARGET)' \ --enable-libjpeg \ --disable-opengl \ diff -r 54522aaf400c -r 47558e958113 src/jpeg.mk --- a/src/jpeg.mk Wed Nov 14 10:53:53 2012 +0100 +++ b/src/jpeg.mk Thu Nov 15 16:11:45 2012 -0500 @@ -19,7 +19,7 @@ cd '$(1)' && ./configure \ --prefix='$(PREFIX)/$(TARGET)' \ --host='$(TARGET)' \ - --disable-shared + $(ENABLE_SHARED_OR_STATIC) $(MAKE) -C '$(1)' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= man_MANS= '$(TARGET)-gcc' \ diff -r 54522aaf400c -r 47558e958113 src/json-c.mk --- a/src/json-c.mk Wed Nov 14 10:53:53 2012 +0100 +++ b/src/json-c.mk Thu Nov 15 16:11:45 2012 -0500 @@ -21,7 +21,7 @@ --host='$(TARGET)' \ --prefix='$(PREFIX)/$(TARGET)' \ --build="`config.guess`"\ - --disable-shared + $(ENABLE_SHARED_OR_STATIC) CFLAGS=-Wno-error $(MAKE) -C '$(1)' -j '$(JOBS)' install diff -r 54522aaf400c -r 47558e958113 src/lame.mk --- a/src/lame.mk Wed Nov 14 10:53:53 2012 +0100 +++ b/src/lame.mk Thu Nov 15 16:11:45 2012 -0500 @@ -20,7 +20,7 @@ --host='$(TARGET)' \ --build="`config.guess`" \ --prefix='$(PREFIX)/$(TARGET)' \ - --disable-shared + $(ENABLE_SHARED_OR_STATIC) $(MAKE) -C '$(1)' -j '$(JOBS)' $(MAKE) -C '$(1)' -j 1 install endef diff -r 54522aaf400c -r 47558e958113 src/lcms.mk --- a/src/lcms.mk Wed Nov 14 10:53:53 2012 +0100 +++ b/src/lcms.mk Thu Nov 15 16:11:45 2012 -0500 @@ -20,7 +20,7 @@ --prefix='$(PREFIX)/$(TARGET)' \ --host='$(TARGET)' \ --build="`config.guess`" \ - --disable-shared \ + $(ENABLE_SHARED_OR_STATIC) \ --with-jpeg \ --with-tiff \ --with-zlib diff -r 54522aaf400c -r 47558e958113 src/lcms1.mk --- a/src/lcms1.mk Wed Nov 14 10:53:53 2012 +0100 +++ b/src/lcms1.mk Thu Nov 15 16:11:45 2012 -0500 @@ -21,7 +21,7 @@ --prefix='$(PREFIX)/$(TARGET)' \ --host='$(TARGET)' \ --build="`config.guess`" \ - --disable-shared \ + $(ENABLE_SHARED_OR_STATIC) \ --with-jpeg \ --with-tiff \ --with-zlib diff -r 54522aaf400c -r 47558e958113 src/libarchive.mk --- a/src/libarchive.mk Wed Nov 14 10:53:53 2012 +0100 +++ b/src/libarchive.mk Thu Nov 15 16:11:45 2012 -0500 @@ -21,7 +21,7 @@ cd '$(1)' && ./configure \ --host='$(TARGET)' \ --prefix='$(PREFIX)/$(TARGET)' \ - --disable-shared \ + $(ENABLE_SHARED_OR_STATIC) \ --disable-bsdtar \ --disable-bsdcpio \ XML2_CONFIG='$(PREFIX)/$(TARGET)'/bin/xml2-config diff -r 54522aaf400c -r 47558e958113 src/libass.mk --- a/src/libass.mk Wed Nov 14 10:53:53 2012 +0100 +++ b/src/libass.mk Thu Nov 15 16:11:45 2012 -0500 @@ -20,7 +20,7 @@ --host='$(TARGET)' \ --build="`config.guess`" \ --prefix='$(PREFIX)/$(TARGET)' \ - --disable-shared \ + $(ENABLE_SHARED_OR_STATIC) \ --disable-enca \ --enable-fontconfig $(MAKE) -C '$(1)' -j '$(JOBS)' diff -r 54522aaf400c -r 47558e958113 src/libcroco.mk --- a/src/libcroco.mk Wed Nov 14 10:53:53 2012 +0100 +++ b/src/libcroco.mk Thu Nov 15 16:11:45 2012 -0500 @@ -19,7 +19,7 @@ define $(PKG)_BUILD cd '$(1)' && ./configure \ --host='$(TARGET)' \ - --disable-shared \ + $(ENABLE_SHARED_OR_STATIC) \ --prefix='$(PREFIX)/$(TARGET)' \ --disable-gtk-doc $(MAKE) -C '$(1)' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= diff -r 54522aaf400c -r 47558e958113 src/libdnet.mk --- a/src/libdnet.mk Wed Nov 14 10:53:53 2012 +0100 +++ b/src/libdnet.mk Thu Nov 15 16:11:45 2012 -0500 @@ -28,7 +28,7 @@ $(SED) -i 's,-mno-cygwin,,' '$(1)/configure' cd '$(1)' && ./configure \ --host='$(TARGET)' \ - --disable-shared \ + $(ENABLE_SHARED_OR_STATIC) \ --prefix='$(PREFIX)/$(TARGET)' $(MAKE) -C '$(1)' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= endef diff -r 54522aaf400c -r 47558e958113 src/libevent.mk --- a/src/libevent.mk Wed Nov 14 10:53:53 2012 +0100 +++ b/src/libevent.mk Thu Nov 15 16:11:45 2012 -0500 @@ -20,7 +20,7 @@ cd '$(1)' && ./configure \ --host='$(TARGET)' \ --build="`config.guess`" \ - --disable-shared \ + $(ENABLE_SHARED_OR_STATIC) \ --prefix='$(PREFIX)/$(TARGET)' $(MAKE) -C '$(1)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= defexec_DATA= endef diff -r 54522aaf400c -r 47558e958113 src/libffi.mk --- a/src/libffi.mk Wed Nov 14 10:53:53 2012 +0100 +++ b/src/libffi.mk Thu Nov 15 16:11:45 2012 -0500 @@ -20,7 +20,7 @@ cd '$(1)' && ./configure \ --host='$(TARGET)' \ --prefix='$(PREFIX)/$(TARGET)' \ - --disable-shared + $(ENABLE_SHARED_OR_STATIC) $(MAKE) -C '$(1)/$(TARGET)' -j '$(JOBS)' $(MAKE) -C '$(1)/$(TARGET)' -j 1 install diff -r 54522aaf400c -r 47558e958113 src/libgcrypt.mk --- a/src/libgcrypt.mk Wed Nov 14 10:53:53 2012 +0100 +++ b/src/libgcrypt.mk Thu Nov 15 16:11:45 2012 -0500 @@ -20,7 +20,7 @@ cd '$(1)' && ./configure \ --host='$(TARGET)' \ --build="`config.guess`" \ - --disable-shared \ + $(ENABLE_SHARED_OR_STATIC) \ --prefix='$(PREFIX)/$(TARGET)' \ --with-gpg-error-prefix='$(PREFIX)/$(TARGET)' $(MAKE) -C '$(1)' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= diff -r 54522aaf400c -r 47558e958113 src/libgda.mk --- a/src/libgda.mk Wed Nov 14 10:53:53 2012 +0100 +++ b/src/libgda.mk Thu Nov 15 16:11:45 2012 -0500 @@ -22,7 +22,7 @@ cd '$(1)' && ./configure \ --host='$(TARGET)' \ --prefix='$(PREFIX)/$(TARGET)' \ - --disable-shared \ + $(ENABLE_SHARED_OR_STATIC) \ --disable-gtk-doc \ --without-bdb \ --with-mdb \ diff -r 54522aaf400c -r 47558e958113 src/libgdamm.mk --- a/src/libgdamm.mk Wed Nov 14 10:53:53 2012 +0100 +++ b/src/libgdamm.mk Thu Nov 15 16:11:45 2012 -0500 @@ -19,7 +19,7 @@ cd '$(1)' && ./configure \ --host='$(TARGET)' \ --build="`config.guess`" \ - --disable-shared \ + $(ENABLE_SHARED_OR_STATIC) \ --prefix='$(PREFIX)/$(TARGET)' \ CXX='$(TARGET)-c++' \ PKG_CONFIG='$(PREFIX)/bin/$(TARGET)-pkg-config' \ diff -r 54522aaf400c -r 47558e958113 src/libgee.mk --- a/src/libgee.mk Wed Nov 14 10:53:53 2012 +0100 +++ b/src/libgee.mk Thu Nov 15 16:11:45 2012 -0500 @@ -20,7 +20,7 @@ define $(PKG)_BUILD cd '$(1)' && ./configure \ --host='$(TARGET)' \ - --disable-shared \ + $(ENABLE_SHARED_OR_STATIC) \ --prefix='$(PREFIX)/$(TARGET)' $(MAKE) -C '$(1)' -j '$(JOBS)' bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= $(MAKE) -C '$(1)' -j 1 install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= diff -r 54522aaf400c -r 47558e958113 src/libgeotiff.mk --- a/src/libgeotiff.mk Wed Nov 14 10:53:53 2012 +0100 +++ b/src/libgeotiff.mk Thu Nov 15 16:11:45 2012 -0500 @@ -21,7 +21,7 @@ touch '$(1)/configure' cd '$(1)' && ./configure \ --host='$(TARGET)' \ - --disable-shared \ + $(ENABLE_SHARED_OR_STATIC) \ --prefix='$(PREFIX)/$(TARGET)' \ LIBS="`'$(TARGET)-pkg-config' --libs libtiff-4` -ljpeg -lz" $(MAKE) -C '$(1)' -j 1 all install EXEEXT=.remove-me MAKE='$(MAKE)' diff -r 54522aaf400c -r 47558e958113 src/libglade.mk --- a/src/libglade.mk Wed Nov 14 10:53:53 2012 +0100 +++ b/src/libglade.mk Thu Nov 15 16:11:45 2012 -0500 @@ -19,7 +19,7 @@ cd '$(1)' && ./configure \ --host='$(TARGET)' \ --build="`config.guess`" \ - --disable-shared \ + $(ENABLE_SHARED_OR_STATIC) \ --prefix='$(PREFIX)/$(TARGET)' \ PKG_CONFIG='$(PREFIX)/bin/$(TARGET)-pkg-config' $(MAKE) -C '$(1)' -j '$(JOBS)' diff -r 54522aaf400c -r 47558e958113 src/libgomp.mk --- a/src/libgomp.mk Wed Nov 14 10:53:53 2012 +0100 +++ b/src/libgomp.mk Thu Nov 15 16:11:45 2012 -0500 @@ -23,7 +23,7 @@ --prefix='$(PREFIX)' \ --enable-version-specific-runtime-libs \ --with-gnu-ld \ - --disable-shared \ + $(ENABLE_SHARED_OR_STATIC) \ LIBS='-lws2_32' $(MAKE) -C '$(1)/build/$(TARGET)/libgomp' -j '$(JOBS)' install diff -r 54522aaf400c -r 47558e958113 src/libgpg_error.mk --- a/src/libgpg_error.mk Wed Nov 14 10:53:53 2012 +0100 +++ b/src/libgpg_error.mk Thu Nov 15 16:11:45 2012 -0500 @@ -19,7 +19,7 @@ cd '$(1)' && ./configure \ --host='$(TARGET)' \ --build="`config.guess`" \ - --disable-shared \ + $(ENABLE_SHARED_OR_STATIC) \ --prefix='$(PREFIX)/$(TARGET)' \ --disable-nls \ --disable-languages diff -r 54522aaf400c -r 47558e958113 src/libgsasl.mk --- a/src/libgsasl.mk Wed Nov 14 10:53:53 2012 +0100 +++ b/src/libgsasl.mk Thu Nov 15 16:11:45 2012 -0500 @@ -20,7 +20,7 @@ cd '$(1)' && touch src/libgsasl-7.def && ./configure \ --host='$(TARGET)' \ --build="`config.guess`" \ - --disable-shared \ + $(ENABLE_SHARED_OR_STATIC) \ --prefix='$(PREFIX)/$(TARGET)' \ --disable-nls \ --with-libgcrypt \ diff -r 54522aaf400c -r 47558e958113 src/libgsf.mk --- a/src/libgsf.mk Wed Nov 14 10:53:53 2012 +0100 +++ b/src/libgsf.mk Thu Nov 15 16:11:45 2012 -0500 @@ -23,7 +23,7 @@ cd '$(1)' && ./configure \ --host='$(TARGET)' \ --build="`config.guess`" \ - --disable-shared \ + $(ENABLE_SHARED_OR_STATIC) \ --prefix='$(PREFIX)/$(TARGET)' \ --disable-nls \ --disable-gtk-doc \ diff -r 54522aaf400c -r 47558e958113 src/libharu.mk --- a/src/libharu.mk Wed Nov 14 10:53:53 2012 +0100 +++ b/src/libharu.mk Thu Nov 15 16:11:45 2012 -0500 @@ -20,7 +20,7 @@ cd '$(1)' && ./configure \ --host='$(TARGET)' \ --prefix='$(PREFIX)/$(TARGET)' \ - --disable-shared \ + $(ENABLE_SHARED_OR_STATIC) \ --with-zlib='$(PREFIX)/$(TARGET)' \ --with-png='$(PREFIX)/$(TARGET)' $(MAKE) -C '$(1)' -j '$(JOBS)' install diff -r 54522aaf400c -r 47558e958113 src/libiberty.mk --- a/src/libiberty.mk Wed Nov 14 10:53:53 2012 +0100 +++ b/src/libiberty.mk Thu Nov 15 16:11:45 2012 -0500 @@ -17,8 +17,7 @@ define $(PKG)_BUILD cd '$(1)' && ./configure \ --host='$(TARGET)' \ - --enable-static \ - --disable-shared \ + $(ENABLE_SHARED_OR_STATIC) \ --prefix='$(PREFIX)/$(TARGET)' \ --enable-install-libiberty $(MAKE) -C '$(1)' -j '$(JOBS)' diff -r 54522aaf400c -r 47558e958113 src/libiconv.mk --- a/src/libiconv.mk Wed Nov 14 10:53:53 2012 +0100 +++ b/src/libiconv.mk Thu Nov 15 16:11:45 2012 -0500 @@ -21,7 +21,7 @@ cd '$(1)' && ./configure \ --host='$(TARGET)' \ --prefix='$(PREFIX)/$(TARGET)' \ - --disable-shared \ + $(ENABLE_SHARED_OR_STATIC) \ --disable-nls $(MAKE) -C '$(1)/libcharset' -j '$(JOBS)' install $(MAKE) -C '$(1)/lib' -j '$(JOBS)' install diff -r 54522aaf400c -r 47558e958113 src/libidn.mk --- a/src/libidn.mk Wed Nov 14 10:53:53 2012 +0100 +++ b/src/libidn.mk Thu Nov 15 16:11:45 2012 -0500 @@ -20,7 +20,7 @@ cd '$(1)' && ./configure \ --host='$(TARGET)' \ --build="`config.guess`" \ - --disable-shared \ + $(ENABLE_SHARED_OR_STATIC) \ --disable-csharp \ --prefix='$(PREFIX)/$(TARGET)' \ --with-libiconv-prefix='$(PREFIX)/$(TARGET)' diff -r 54522aaf400c -r 47558e958113 src/liblo.mk --- a/src/liblo.mk Wed Nov 14 10:53:53 2012 +0100 +++ b/src/liblo.mk Thu Nov 15 16:11:45 2012 -0500 @@ -18,7 +18,7 @@ define $(PKG)_BUILD cd '$(1)' && ./configure \ --host='$(TARGET)' \ - --disable-shared \ + $(ENABLE_SHARED_OR_STATIC) \ --prefix='$(PREFIX)/$(TARGET)' $(MAKE) -C '$(1)' -j '$(JOBS)' bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= $(MAKE) -C '$(1)' -j 1 install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= diff -r 54522aaf400c -r 47558e958113 src/libmad.mk --- a/src/libmad.mk Wed Nov 14 10:53:53 2012 +0100 +++ b/src/libmad.mk Thu Nov 15 16:11:45 2012 -0500 @@ -19,7 +19,7 @@ $(SED) -i '/-fforce-mem/d' '$(1)'/configure cd '$(1)' && ./configure \ --host='$(TARGET)' \ - --disable-shared \ + $(ENABLE_SHARED_OR_STATIC) \ --prefix='$(PREFIX)/$(TARGET)' $(MAKE) -C '$(1)' -j '$(JOBS)' install endef diff -r 54522aaf400c -r 47558e958113 src/libmikmod.mk --- a/src/libmikmod.mk Wed Nov 14 10:53:53 2012 +0100 +++ b/src/libmikmod.mk Thu Nov 15 16:11:45 2012 -0500 @@ -24,7 +24,7 @@ RANLIB='$(TARGET)-ranlib' \ STRIP='$(TARGET)-strip' \ ./configure \ - --disable-shared \ + $(ENABLE_SHARED_OR_STATIC) \ --prefix='$(PREFIX)/$(TARGET)' \ --libdir='$(PREFIX)/$(TARGET)/lib' \ --disable-esd diff -r 54522aaf400c -r 47558e958113 src/libmodplug.mk --- a/src/libmodplug.mk Wed Nov 14 10:53:53 2012 +0100 +++ b/src/libmodplug.mk Thu Nov 15 16:11:45 2012 -0500 @@ -19,8 +19,7 @@ define $(PKG)_BUILD cd '$(1)' && ./configure \ --host='$(TARGET)' \ - --disable-shared \ - --enable-static \ + $(ENABLE_SHARED_OR_STATIC) \ --prefix='$(PREFIX)/$(TARGET)' $(MAKE) -C '$(1)' -j '$(JOBS)' install diff -r 54522aaf400c -r 47558e958113 src/libntlm.mk --- a/src/libntlm.mk Wed Nov 14 10:53:53 2012 +0100 +++ b/src/libntlm.mk Thu Nov 15 16:11:45 2012 -0500 @@ -20,7 +20,7 @@ cd '$(1)' && ./configure \ --host='$(TARGET)' \ --build="`config.guess`" \ - --disable-shared \ + $(ENABLE_SHARED_OR_STATIC) \ --prefix='$(PREFIX)/$(TARGET)' $(MAKE) -C '$(1)' -j 1 install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= endef diff -r 54522aaf400c -r 47558e958113 src/liboauth.mk --- a/src/liboauth.mk Wed Nov 14 10:53:53 2012 +0100 +++ b/src/liboauth.mk Thu Nov 15 16:11:45 2012 -0500 @@ -19,7 +19,7 @@ cd '$(1)' && ./configure \ --host='$(TARGET)' \ --prefix='$(PREFIX)/$(TARGET)' \ - --disable-shared \ + $(ENABLE_SHARED_OR_STATIC) \ --disable-curl $(MAKE) -C '$(1)' -j '$(JOBS)' $(MAKE) -C '$(1)' -j 1 install diff -r 54522aaf400c -r 47558e958113 src/libodbc++.mk --- a/src/libodbc++.mk Wed Nov 14 10:53:53 2012 +0100 +++ b/src/libodbc++.mk Thu Nov 15 16:11:45 2012 -0500 @@ -24,7 +24,7 @@ cd '$(1)' && ./configure \ --prefix='$(PREFIX)/$(TARGET)' \ --host='$(TARGET)' \ - --disable-shared \ + $(ENABLE_SHARED_OR_STATIC) \ --without-tests \ --disable-dependency-tracking $(MAKE) -C '$(1)' -j '$(JOBS)' install doxygen= progref_dist_files= diff -r 54522aaf400c -r 47558e958113 src/liboil.mk --- a/src/liboil.mk Wed Nov 14 10:53:53 2012 +0100 +++ b/src/liboil.mk Thu Nov 15 16:11:45 2012 -0500 @@ -19,7 +19,7 @@ cd '$(1)' && ./configure \ --host='$(TARGET)' \ --prefix='$(PREFIX)/$(TARGET)' \ - --disable-shared \ + $(ENABLE_SHARED_OR_STATIC) \ --disable-debug \ --disable-examples \ --mandir='$(1)/sink' \ diff -r 54522aaf400c -r 47558e958113 src/libpano13.mk --- a/src/libpano13.mk Wed Nov 14 10:53:53 2012 +0100 +++ b/src/libpano13.mk Thu Nov 15 16:11:45 2012 -0500 @@ -25,7 +25,7 @@ cd '$(1)' && ./configure \ --prefix='$(PREFIX)/$(TARGET)' \ --host='$(TARGET)' \ - --disable-shared \ + $(ENABLE_SHARED_OR_STATIC) \ --with-jpeg='$(PREFIX)/$(TARGET)'/lib \ --with-tiff='$(PREFIX)/$(TARGET)'/lib \ --with-png='$(PREFIX)/$(TARGET)'/lib \ diff -r 54522aaf400c -r 47558e958113 src/libpaper.mk --- a/src/libpaper.mk Wed Nov 14 10:53:53 2012 +0100 +++ b/src/libpaper.mk Thu Nov 15 16:11:45 2012 -0500 @@ -20,7 +20,7 @@ cd '$(1)' && ./configure \ --host='$(TARGET)' \ --build="`config.guess`" \ - --disable-shared \ + $(ENABLE_SHARED_OR_STATIC) \ --prefix='$(PREFIX)/$(TARGET)' $(MAKE) -C '$(1)' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= endef diff -r 54522aaf400c -r 47558e958113 src/libpng.mk --- a/src/libpng.mk Wed Nov 14 10:53:53 2012 +0100 +++ b/src/libpng.mk Thu Nov 15 16:11:45 2012 -0500 @@ -25,7 +25,7 @@ cd '$(1)' && ./configure \ --host='$(TARGET)' \ --build="`config.guess`" \ - --disable-shared \ + $(ENABLE_SHARED_OR_STATIC) \ --prefix='$(PREFIX)/$(TARGET)' $(MAKE) -C '$(1)' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= diff -r 54522aaf400c -r 47558e958113 src/librsvg.mk --- a/src/librsvg.mk Wed Nov 14 10:53:53 2012 +0100 +++ b/src/librsvg.mk Thu Nov 15 16:11:45 2012 -0500 @@ -19,7 +19,7 @@ cd '$(1)' && ./configure \ --host='$(TARGET)' \ --build="`config.guess`" \ - --disable-shared \ + $(ENABLE_SHARED_OR_STATIC) \ --prefix='$(PREFIX)/$(TARGET)' \ --disable-pixbuf-loader \ --disable-gtk-theme \ diff -r 54522aaf400c -r 47558e958113 src/libsamplerate.mk --- a/src/libsamplerate.mk Wed Nov 14 10:53:53 2012 +0100 +++ b/src/libsamplerate.mk Thu Nov 15 16:11:45 2012 -0500 @@ -21,7 +21,7 @@ cd '$(1)' && ./configure \ --host='$(TARGET)' \ --build="`config.guess`" \ - --disable-shared \ + $(ENABLE_SHARED_OR_STATIC) \ --prefix='$(PREFIX)/$(TARGET)' $(MAKE) -C '$(1)' -j '$(JOBS)' bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= $(MAKE) -C '$(1)' -j 1 install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= diff -r 54522aaf400c -r 47558e958113 src/libshout.mk --- a/src/libshout.mk Wed Nov 14 10:53:53 2012 +0100 +++ b/src/libshout.mk Thu Nov 15 16:11:45 2012 -0500 @@ -20,7 +20,7 @@ --host='$(TARGET)' \ --build="`config.guess`" \ --prefix='$(PREFIX)/$(TARGET)' \ - --disable-shared \ + $(ENABLE_SHARED_OR_STATIC) \ --disable-thread \ --infodir='$(1)/sink' \ --mandir='$(1)/sink' diff -r 54522aaf400c -r 47558e958113 src/libsigc++.mk --- a/src/libsigc++.mk Wed Nov 14 10:53:53 2012 +0100 +++ b/src/libsigc++.mk Thu Nov 15 16:11:45 2012 -0500 @@ -20,7 +20,7 @@ cd '$(1)' && ./configure \ --host='$(TARGET)' \ --build="`config.guess`" \ - --disable-shared \ + $(ENABLE_SHARED_OR_STATIC) \ --prefix='$(PREFIX)/$(TARGET)' \ CXX='$(TARGET)-c++' \ PKG_CONFIG='$(PREFIX)/bin/$(TARGET)-pkg-config' \ diff -r 54522aaf400c -r 47558e958113 src/libsndfile.mk --- a/src/libsndfile.mk Wed Nov 14 10:53:53 2012 +0100 +++ b/src/libsndfile.mk Thu Nov 15 16:11:45 2012 -0500 @@ -19,7 +19,7 @@ define $(PKG)_BUILD cd '$(1)' && ./configure \ --host='$(TARGET)' \ - --disable-shared \ + $(ENABLE_SHARED_OR_STATIC) \ --prefix='$(PREFIX)/$(TARGET)' \ --enable-sqlite \ --enable-external-libs \ diff -r 54522aaf400c -r 47558e958113 src/libssh2.mk --- a/src/libssh2.mk Wed Nov 14 10:53:53 2012 +0100 +++ b/src/libssh2.mk Thu Nov 15 16:11:45 2012 -0500 @@ -20,7 +20,7 @@ cd '$(1)' && ./buildconf cd '$(1)' && ./configure \ --host='$(TARGET)' \ - --disable-shared \ + $(ENABLE_SHARED_OR_STATIC) \ --prefix='$(PREFIX)/$(TARGET)' \ --without-openssl \ --with-libgcrypt \ diff -r 54522aaf400c -r 47558e958113 src/libtool.mk --- a/src/libtool.mk Wed Nov 14 10:53:53 2012 +0100 +++ b/src/libtool.mk Thu Nov 15 16:11:45 2012 -0500 @@ -19,7 +19,7 @@ cd '$(1)/libltdl' && ./configure \ --host='$(TARGET)' \ --prefix='$(PREFIX)/$(TARGET)' \ - --disable-shared \ + $(ENABLE_SHARED_OR_STATIC) \ --enable-ltdl-install $(MAKE) -C '$(1)/libltdl' -j '$(JOBS)' $(MAKE) -C '$(1)/libltdl' -j 1 install diff -r 54522aaf400c -r 47558e958113 src/libunistring.mk --- a/src/libunistring.mk Wed Nov 14 10:53:53 2012 +0100 +++ b/src/libunistring.mk Thu Nov 15 16:11:45 2012 -0500 @@ -20,7 +20,7 @@ cd '$(1)' && ./configure \ --host='$(TARGET)' \ --prefix='$(PREFIX)/$(TARGET)' \ - --disable-shared \ + $(ENABLE_SHARED_OR_STATIC) \ --enable-threads=win32 $(MAKE) -C '$(1)' -j '$(JOBS)' $(MAKE) -C '$(1)' -j 1 install diff -r 54522aaf400c -r 47558e958113 src/libxml++.mk --- a/src/libxml++.mk Wed Nov 14 10:53:53 2012 +0100 +++ b/src/libxml++.mk Thu Nov 15 16:11:45 2012 -0500 @@ -20,7 +20,7 @@ cd '$(1)' && CXX="$(TARGET)-g++ -mthreads" ./configure \ --host='$(TARGET)' \ --build="`config.guess`" \ - --disable-shared \ + $(ENABLE_SHARED_OR_STATIC) \ --prefix='$(PREFIX)/$(TARGET)' \ MAKE=$(MAKE) $(MAKE) -C '$(1)' -j '$(JOBS)' bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= diff -r 54522aaf400c -r 47558e958113 src/libxml2.mk --- a/src/libxml2.mk Wed Nov 14 10:53:53 2012 +0100 +++ b/src/libxml2.mk Thu Nov 15 16:11:45 2012 -0500 @@ -21,7 +21,7 @@ cd '$(1)' && ./configure \ --host='$(TARGET)' \ --build="`config.guess`" \ - --disable-shared \ + $(ENABLE_SHARED_OR_STATIC) \ --without-debug \ --prefix='$(PREFIX)/$(TARGET)' \ --without-python \ diff -r 54522aaf400c -r 47558e958113 src/libxslt.mk --- a/src/libxslt.mk Wed Nov 14 10:53:53 2012 +0100 +++ b/src/libxslt.mk Thu Nov 15 16:11:45 2012 -0500 @@ -19,7 +19,7 @@ define $(PKG)_BUILD cd '$(1)' && ./configure \ --host='$(TARGET)' \ - --disable-shared \ + $(ENABLE_SHARED_OR_STATIC) \ --without-debug \ --prefix='$(PREFIX)/$(TARGET)' \ --with-libxml-prefix='$(PREFIX)/$(TARGET)' \ diff -r 54522aaf400c -r 47558e958113 src/log4cxx.mk --- a/src/log4cxx.mk Wed Nov 14 10:53:53 2012 +0100 +++ b/src/log4cxx.mk Thu Nov 15 16:11:45 2012 -0500 @@ -20,8 +20,7 @@ cd '$(1)' && ./configure \ --prefix='$(PREFIX)/$(TARGET)' \ --host='$(TARGET)' \ - --disable-shared \ - --enable-static \ + $(ENABLE_SHARED_OR_STATIC) \ --with-apr='$(PREFIX)/$(TARGET)' \ --with-apr-util='$(PREFIX)/$(TARGET)' \ CFLAGS=-D_WIN32_WINNT=0x0500 \ diff -r 54522aaf400c -r 47558e958113 src/lzo.mk --- a/src/lzo.mk Wed Nov 14 10:53:53 2012 +0100 +++ b/src/lzo.mk Thu Nov 15 16:11:45 2012 -0500 @@ -20,7 +20,7 @@ define $(PKG)_BUILD cd '$(1)' && ./configure \ --host='$(TARGET)' \ - --disable-shared \ + $(ENABLE_SHARED_OR_STATIC) \ --prefix='$(PREFIX)/$(TARGET)' $(MAKE) -C '$(1)' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= endef diff -r 54522aaf400c -r 47558e958113 src/matio.mk --- a/src/matio.mk Wed Nov 14 10:53:53 2012 +0100 +++ b/src/matio.mk Thu Nov 15 16:11:45 2012 -0500 @@ -19,7 +19,7 @@ cd '$(1)' && ./configure \ --host='$(TARGET)' \ --prefix='$(PREFIX)/$(TARGET)' \ - --disable-shared \ + $(ENABLE_SHARED_OR_STATIC) \ --disable-test \ --disable-docs $(MAKE) -C '$(1)' -j '$(JOBS)' diff -r 54522aaf400c -r 47558e958113 src/mdbtools.mk --- a/src/mdbtools.mk Wed Nov 14 10:53:53 2012 +0100 +++ b/src/mdbtools.mk Thu Nov 15 16:11:45 2012 -0500 @@ -23,7 +23,7 @@ cd '$(1)' && ./configure \ --host='$(TARGET)' \ --build="`config.guess`" \ - --disable-shared \ + $(ENABLE_SHARED_OR_STATIC) \ --prefix='$(PREFIX)/$(TARGET)' \ PKG_CONFIG='$(PREFIX)/bin/$(TARGET)-pkg-config' $(MAKE) -C '$(1)' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= html_DATA= diff -r 54522aaf400c -r 47558e958113 src/mingw-utils.mk --- a/src/mingw-utils.mk Wed Nov 14 10:53:53 2012 +0100 +++ b/src/mingw-utils.mk Thu Nov 15 16:11:45 2012 -0500 @@ -19,7 +19,7 @@ # native build cp -Rp '$(1)' '$(1).native' cd '$(1).native' && ./configure \ - --disable-shared \ + $(ENABLE_SHARED_OR_STATIC) \ --prefix='$(PREFIX)' $(MAKE) -C '$(1).native/reimp' -j '$(JOBS)' $(INSTALL) -m755 '$(1).native/reimp/reimp' '$(PREFIX)/bin/$(TARGET)-reimp' @@ -27,7 +27,7 @@ # cross build cd '$(1)' && ./configure \ --host='$(TARGET)' \ - --disable-shared \ + $(ENABLE_SHARED_OR_STATIC) \ --prefix='$(PREFIX)/$(TARGET)' $(MAKE) -C '$(1)' -j '$(JOBS)' $(MAKE) -C '$(1)' -j 1 install diff -r 54522aaf400c -r 47558e958113 src/mpfr.mk --- a/src/mpfr.mk Wed Nov 14 10:53:53 2012 +0100 +++ b/src/mpfr.mk Thu Nov 15 16:11:45 2012 -0500 @@ -20,8 +20,7 @@ define $(PKG)_BUILD cd '$(1)' && ./configure \ --host='$(TARGET)' \ - --enable-static \ - --disable-shared \ + $(ENABLE_SHARED_OR_STATIC) \ --prefix='$(PREFIX)/$(TARGET)' \ --enable-threads=win32 \ --with-gmp-include='$(PREFIX)/$(TARGET)/include/' diff -r 54522aaf400c -r 47558e958113 src/muparser.mk --- a/src/muparser.mk Wed Nov 14 10:53:53 2012 +0100 +++ b/src/muparser.mk Thu Nov 15 16:11:45 2012 -0500 @@ -19,7 +19,7 @@ cd '$(1)' && ./configure \ --host='$(TARGET)' \ --prefix='$(PREFIX)/$(TARGET)' \ - --disable-shared \ + $(ENABLE_SHARED_OR_STATIC) \ --disable-samples \ --disable-debug $(MAKE) -C '$(1)' -j '$(JOBS)' install diff -r 54522aaf400c -r 47558e958113 src/mxml.mk --- a/src/mxml.mk Wed Nov 14 10:53:53 2012 +0100 +++ b/src/mxml.mk Thu Nov 15 16:11:45 2012 -0500 @@ -18,7 +18,7 @@ define $(PKG)_BUILD cd '$(1)' && ./configure \ --host='$(TARGET)' \ - --disable-shared \ + $(ENABLE_SHARED_OR_STATIC) \ --prefix='$(PREFIX)/$(TARGET)' \ --enable-threads $(MAKE) -C '$(1)' -j '$(JOBS)' libmxml.a diff -r 54522aaf400c -r 47558e958113 src/ncurses.mk --- a/src/ncurses.mk Wed Nov 14 10:53:53 2012 +0100 +++ b/src/ncurses.mk Thu Nov 15 16:11:45 2012 -0500 @@ -30,6 +30,6 @@ --without-manpages \ --enable-pc-files \ --with-normal \ - --without-shared + $(WITH_SHARED_OR_STATIC) $(MAKE) -C '$(1)' -j '$(JOBS)' install endef diff -r 54522aaf400c -r 47558e958113 src/nettle.mk --- a/src/nettle.mk Wed Nov 14 10:53:53 2012 +0100 +++ b/src/nettle.mk Thu Nov 15 16:11:45 2012 -0500 @@ -20,7 +20,7 @@ cd '$(1)' && ./configure \ --host='$(TARGET)' \ --build="`config.guess`" \ - --disable-shared \ + $(ENABLE_SHARED_OR_STATIC) \ --prefix='$(PREFIX)/$(TARGET)' $(MAKE) -C '$(1)' -j '$(JOBS)' getopt.o getopt1.o $(MAKE) -C '$(1)' -j '$(JOBS)' install diff -r 54522aaf400c -r 47558e958113 src/ogg.mk --- a/src/ogg.mk Wed Nov 14 10:53:53 2012 +0100 +++ b/src/ogg.mk Thu Nov 15 16:11:45 2012 -0500 @@ -19,7 +19,7 @@ cd '$(1)' && ./configure \ --host='$(TARGET)' \ --build="`config.guess`" \ - --disable-shared \ + $(ENABLE_SHARED_OR_STATIC) \ --prefix='$(PREFIX)/$(TARGET)' $(MAKE) -C '$(1)' -j '$(JOBS)' bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= $(MAKE) -C '$(1)' -j 1 install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= diff -r 54522aaf400c -r 47558e958113 src/opencore-amr.mk --- a/src/opencore-amr.mk Wed Nov 14 10:53:53 2012 +0100 +++ b/src/opencore-amr.mk Thu Nov 15 16:11:45 2012 -0500 @@ -19,7 +19,7 @@ cd '$(1)' && ./configure \ --host='$(TARGET)' \ --prefix='$(PREFIX)/$(TARGET)' \ - --disable-shared + $(ENABLE_SHARED_OR_STATIC) $(MAKE) -C '$(1)' -j '$(JOBS)' $(MAKE) -C '$(1)' -j 1 install endef diff -r 54522aaf400c -r 47558e958113 src/openexr.mk --- a/src/openexr.mk Wed Nov 14 10:53:53 2012 +0100 +++ b/src/openexr.mk Thu Nov 15 16:11:45 2012 -0500 @@ -24,7 +24,7 @@ echo 'echo $1' > '$(1)/$(ilmbase_SUBDIR)/config.sub' cd '$(1)/$(ilmbase_SUBDIR)' && $(SHELL) ./configure \ --build="`config.guess`" \ - --disable-shared \ + $(ENABLE_SHARED_OR_STATIC) \ --prefix='$(1)/ilmbase' \ --enable-threading=no \ --disable-posix-sem \ @@ -34,7 +34,7 @@ cd '$(1)' && ./configure \ --host='$(TARGET)' \ --build="`config.guess`" \ - --disable-shared \ + $(ENABLE_SHARED_OR_STATIC) \ --prefix='$(PREFIX)/$(TARGET)' \ --disable-threading \ --disable-posix-sem \ diff -r 54522aaf400c -r 47558e958113 src/pango.mk --- a/src/pango.mk Wed Nov 14 10:53:53 2012 +0100 +++ b/src/pango.mk Thu Nov 15 16:11:45 2012 -0500 @@ -22,7 +22,7 @@ cd '$(1)' && ./configure \ --host='$(TARGET)' \ --build="`config.guess`" \ - --disable-shared \ + $(ENABLE_SHARED_OR_STATIC) \ --prefix='$(PREFIX)/$(TARGET)' \ --disable-gtk-doc \ --without-x \ diff -r 54522aaf400c -r 47558e958113 src/pangomm.mk --- a/src/pangomm.mk Wed Nov 14 10:53:53 2012 +0100 +++ b/src/pangomm.mk Thu Nov 15 16:11:45 2012 -0500 @@ -20,7 +20,7 @@ cd '$(1)' && ./configure \ --host='$(TARGET)' \ --build="`config.guess`" \ - --disable-shared \ + $(ENABLE_SHARED_OR_STATIC) \ --prefix='$(PREFIX)/$(TARGET)' \ MAKE=$(MAKE) $(MAKE) -C '$(1)' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= diff -r 54522aaf400c -r 47558e958113 src/pcre.mk --- a/src/pcre.mk Wed Nov 14 10:53:53 2012 +0100 +++ b/src/pcre.mk Thu Nov 15 16:11:45 2012 -0500 @@ -22,7 +22,7 @@ cd '$(1)' && ./configure \ --host='$(TARGET)' \ --build="`config.guess`" \ - --disable-shared \ + $(ENABLE_SHARED_OR_STATIC) \ --prefix='$(PREFIX)/$(TARGET)' \ --enable-pcre16 \ --enable-utf \ diff -r 54522aaf400c -r 47558e958113 src/pdflib_lite.mk --- a/src/pdflib_lite.mk Wed Nov 14 10:53:53 2012 +0100 +++ b/src/pdflib_lite.mk Thu Nov 15 16:11:45 2012 -0500 @@ -21,7 +21,7 @@ cd '$(1)' && ./configure \ --host='$(TARGET)' \ --build="`config.guess`" \ - --disable-shared \ + $(ENABLE_SHARED_OR_STATIC) \ --prefix='$(PREFIX)/$(TARGET)' \ --without-openssl \ --without-java \ diff -r 54522aaf400c -r 47558e958113 src/pfstools.mk --- a/src/pfstools.mk Wed Nov 14 10:53:53 2012 +0100 +++ b/src/pfstools.mk Thu Nov 15 16:11:45 2012 -0500 @@ -19,7 +19,7 @@ cd '$(1)' && ./configure \ --host='$(TARGET)' \ --prefix='$(PREFIX)/$(TARGET)' \ - --disable-shared \ + $(ENABLE_SHARED_OR_STATIC) \ --disable-netpbm \ --disable-openexr \ --disable-tiff \ diff -r 54522aaf400c -r 47558e958113 src/pixman.mk --- a/src/pixman.mk Wed Nov 14 10:53:53 2012 +0100 +++ b/src/pixman.mk Thu Nov 15 16:11:45 2012 -0500 @@ -20,7 +20,7 @@ cd '$(1)' && ./configure \ --host='$(TARGET)' \ --build="`config.guess`" \ - --disable-shared \ + $(ENABLE_SHARED_OR_STATIC) \ --prefix='$(PREFIX)/$(TARGET)' $(MAKE) -C '$(1)' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= endef diff -r 54522aaf400c -r 47558e958113 src/plibc.mk --- a/src/plibc.mk Wed Nov 14 10:53:53 2012 +0100 +++ b/src/plibc.mk Thu Nov 15 16:11:45 2012 -0500 @@ -20,7 +20,6 @@ --host='$(TARGET)' \ --build="`config.guess`" \ --prefix='$(PREFIX)/$(TARGET)' \ - --enable-static \ - --disable-shared + $(ENABLE_SHARED_OR_STATIC) $(MAKE) -C '$(1)' -j '$(JOBS)' install endef diff -r 54522aaf400c -r 47558e958113 src/plotmm.mk --- a/src/plotmm.mk Wed Nov 14 10:53:53 2012 +0100 +++ b/src/plotmm.mk Thu Nov 15 16:11:45 2012 -0500 @@ -19,7 +19,7 @@ cd '$(1)' && ./configure \ --host='$(TARGET)' \ --prefix='$(PREFIX)/$(TARGET)' \ - --disable-shared + $(ENABLE_SHARED_OR_STATIC) $(MAKE) -C '$(1)' -j '$(JOBS)' install \ bin_PROGRAMS= \ sbin_PROGRAMS= \ diff -r 54522aaf400c -r 47558e958113 src/plotutils.mk --- a/src/plotutils.mk Wed Nov 14 10:53:53 2012 +0100 +++ b/src/plotutils.mk Thu Nov 15 16:11:45 2012 -0500 @@ -21,7 +21,7 @@ cd '$(1)' && ./configure \ --prefix='$(PREFIX)/$(TARGET)' \ --host='$(TARGET)' \ - --disable-shared \ + $(ENABLE_SHARED_OR_STATIC) \ --enable-libplotter \ --enable-libxmi \ --with-png \ diff -r 54522aaf400c -r 47558e958113 src/poppler.mk --- a/src/poppler.mk Wed Nov 14 10:53:53 2012 +0100 +++ b/src/poppler.mk Thu Nov 15 16:11:45 2012 -0500 @@ -25,8 +25,7 @@ --build="`config.guess`" \ --prefix='$(PREFIX)/$(TARGET)' \ --disable-silent-rules \ - --disable-shared \ - --enable-static \ + $(ENABLE_SHARED_OR_STATIC) \ --enable-xpdf-headers \ --enable-poppler-qt4 \ --enable-zlib \ diff -r 54522aaf400c -r 47558e958113 src/popt.mk --- a/src/popt.mk Wed Nov 14 10:53:53 2012 +0100 +++ b/src/popt.mk Thu Nov 15 16:11:45 2012 -0500 @@ -20,7 +20,7 @@ define $(PKG)_BUILD cd '$(1)' && ./configure \ --host='$(TARGET)' \ - --disable-shared \ + $(ENABLE_SHARED_OR_STATIC) \ --prefix='$(PREFIX)/$(TARGET)' \ --enable-nls $(MAKE) -C '$(1)' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= diff -r 54522aaf400c -r 47558e958113 src/portaudio.mk --- a/src/portaudio.mk Wed Nov 14 10:53:53 2012 +0100 +++ b/src/portaudio.mk Thu Nov 15 16:11:45 2012 -0500 @@ -19,7 +19,7 @@ cd '$(1)' && autoconf cd '$(1)' && ./configure \ --host='$(TARGET)' \ - --disable-shared \ + $(ENABLE_SHARED_OR_STATIC) \ --prefix='$(PREFIX)/$(TARGET)' \ --with-host_os=mingw \ --with-winapi=wmme,directx,wasapi,wdmks \ diff -r 54522aaf400c -r 47558e958113 src/postgresql.mk --- a/src/postgresql.mk Wed Nov 14 10:53:53 2012 +0100 +++ b/src/postgresql.mk Thu Nov 15 16:11:45 2012 -0500 @@ -26,7 +26,7 @@ --prefix='$(PREFIX)/$(TARGET)' \ --host='$(TARGET)' \ --build="`config.guess`" \ - --disable-shared \ + $(ENABLE_SHARED_OR_STATIC) \ --disable-rpath \ --without-tcl \ --without-perl \ @@ -53,7 +53,7 @@ $(SED) -i 's,-DVAL_,-D_DISABLED_VAL_,g' '$(1).native'/src/bin/pg_config/Makefile cd '$(1).native' && ./configure \ --prefix='$(PREFIX)/$(TARGET)' \ - --disable-shared \ + $(ENABLE_SHARED_OR_STATIC) \ --disable-rpath \ --without-tcl \ --without-perl \ diff -r 54522aaf400c -r 47558e958113 src/proj.mk --- a/src/proj.mk Wed Nov 14 10:53:53 2012 +0100 +++ b/src/proj.mk Thu Nov 15 16:11:45 2012 -0500 @@ -19,7 +19,7 @@ define $(PKG)_BUILD cd '$(1)' && ./configure \ --host='$(TARGET)' \ - --disable-shared \ + $(ENABLE_SHARED_OR_STATIC) \ --prefix='$(PREFIX)/$(TARGET)' \ --with-mutex $(MAKE) -C '$(1)' -j '$(JOBS)' diff -r 54522aaf400c -r 47558e958113 src/protobuf.mk --- a/src/protobuf.mk Wed Nov 14 10:53:53 2012 +0100 +++ b/src/protobuf.mk Thu Nov 15 16:11:45 2012 -0500 @@ -18,7 +18,7 @@ define $(PKG)_BUILD # First step: Build for host system in order to create "protoc" binary. cd '$(1)' && ./configure \ - --disable-shared + $(ENABLE_SHARED_OR_STATIC) $(MAKE) -C '$(1)' -j '$(JOBS)' cp '$(1)/src/protoc' '$(1)/src/protoc_host' $(MAKE) -C '$(1)' -j 1 distclean @@ -26,7 +26,7 @@ cd '$(1)' && ./configure \ --host='$(TARGET)' \ --prefix='$(PREFIX)/$(TARGET)' \ - --disable-shared \ + $(ENABLE_SHARED_OR_STATIC) \ --with-zlib \ --with-protoc=src/protoc_host $(MAKE) -C '$(1)' -j '$(JOBS)' diff -r 54522aaf400c -r 47558e958113 src/readline.mk --- a/src/readline.mk Wed Nov 14 10:53:53 2012 +0100 +++ b/src/readline.mk Thu Nov 15 16:11:45 2012 -0500 @@ -21,11 +21,11 @@ $(SED) -i 's,^ *case SIGTSTP:.*,,' '$(1)/signals.c' cd '$(1)' && ./configure \ --host='$(TARGET)' \ - --disable-shared \ + $(ENABLE_SHARED_OR_STATIC) \ --prefix='$(PREFIX)/$(TARGET)' \ --enable-multibyte \ --without-purify \ --with-curses \ LIBS='-lpdcurses' - $(MAKE) -C '$(1)' -j '$(JOBS)' install SHARED_LIBS= + $(MAKE) -C '$(1)' -j '$(JOBS)' install endef diff -r 54522aaf400c -r 47558e958113 src/sdl.mk --- a/src/sdl.mk Wed Nov 14 10:53:53 2012 +0100 +++ b/src/sdl.mk Thu Nov 15 16:11:45 2012 -0500 @@ -19,7 +19,7 @@ $(SED) -i 's,-mwindows,-lwinmm -mwindows,' '$(1)/configure' cd '$(1)' && ./configure \ --host='$(TARGET)' \ - --disable-shared \ + $(ENABLE_SHARED_OR_STATIC) \ --prefix='$(PREFIX)/$(TARGET)' \ --enable-threads \ --enable-directx \ diff -r 54522aaf400c -r 47558e958113 src/sdl_image.mk --- a/src/sdl_image.mk Wed Nov 14 10:53:53 2012 +0100 +++ b/src/sdl_image.mk Thu Nov 15 16:11:45 2012 -0500 @@ -19,7 +19,7 @@ $(SED) -i 's,^\(Requires:.*\),\1 libtiff-4 libpng,' '$(1)/SDL_image.pc.in' cd '$(1)' && ./configure \ --host='$(TARGET)' \ - --disable-shared \ + $(ENABLE_SHARED_OR_STATIC) \ --prefix='$(PREFIX)/$(TARGET)' \ --with-sdl-prefix='$(PREFIX)/$(TARGET)' \ --disable-sdltest \ diff -r 54522aaf400c -r 47558e958113 src/sdl_mixer.mk --- a/src/sdl_mixer.mk Wed Nov 14 10:53:53 2012 +0100 +++ b/src/sdl_mixer.mk Thu Nov 15 16:11:45 2012 -0500 @@ -25,7 +25,7 @@ $(SED) -i 's,for path in /usr/local; do,for path in; do,' '$(1)/configure' cd '$(1)' && ./configure \ --host='$(TARGET)' \ - --disable-shared \ + $(ENABLE_SHARED_OR_STATIC) \ --prefix='$(PREFIX)/$(TARGET)' \ --with-sdl-prefix='$(PREFIX)/$(TARGET)' \ --disable-sdltest \ diff -r 54522aaf400c -r 47558e958113 src/sdl_net.mk --- a/src/sdl_net.mk Wed Nov 14 10:53:53 2012 +0100 +++ b/src/sdl_net.mk Thu Nov 15 16:11:45 2012 -0500 @@ -18,7 +18,7 @@ define $(PKG)_BUILD cd '$(1)' && ./configure \ --host='$(TARGET)' \ - --disable-shared \ + $(ENABLE_SHARED_OR_STATIC) \ --prefix='$(PREFIX)/$(TARGET)' \ --with-sdl-prefix='$(PREFIX)/$(TARGET)' \ --disable-sdltest \ diff -r 54522aaf400c -r 47558e958113 src/sdl_pango.mk --- a/src/sdl_pango.mk Wed Nov 14 10:53:53 2012 +0100 +++ b/src/sdl_pango.mk Thu Nov 15 16:11:45 2012 -0500 @@ -20,7 +20,7 @@ $(SED) -i 's,^\(Requires:.*\),\1 pangoft2,' '$(1)/SDL_Pango.pc.in' cd '$(1)' && ./configure \ --host='$(TARGET)' \ - --disable-shared \ + $(ENABLE_SHARED_OR_STATIC) \ --prefix='$(PREFIX)/$(TARGET)' \ --with-sdl-prefix='$(PREFIX)/$(TARGET)' \ --disable-sdltest \ diff -r 54522aaf400c -r 47558e958113 src/sdl_sound.mk --- a/src/sdl_sound.mk Wed Nov 14 10:53:53 2012 +0100 +++ b/src/sdl_sound.mk Thu Nov 15 16:11:45 2012 -0500 @@ -18,7 +18,7 @@ define $(PKG)_BUILD cd '$(1)' && ./configure \ --host='$(TARGET)' \ - --disable-shared \ + $(ENABLE_SHARED_OR_STATIC) \ --prefix='$(PREFIX)/$(TARGET)' \ --with-sdl-prefix='$(PREFIX)/$(TARGET)' \ --disable-sdltest \ diff -r 54522aaf400c -r 47558e958113 src/sdl_ttf.mk --- a/src/sdl_ttf.mk Wed Nov 14 10:53:53 2012 +0100 +++ b/src/sdl_ttf.mk Thu Nov 15 16:11:45 2012 -0500 @@ -18,7 +18,7 @@ define $(PKG)_BUILD cd '$(1)' && ./configure \ --host='$(TARGET)' \ - --disable-shared \ + $(ENABLE_SHARED_OR_STATIC) \ --prefix='$(PREFIX)/$(TARGET)' \ --with-sdl-prefix='$(PREFIX)/$(TARGET)' \ --disable-sdltest \ diff -r 54522aaf400c -r 47558e958113 src/smpeg.mk --- a/src/smpeg.mk Wed Nov 14 10:53:53 2012 +0100 +++ b/src/smpeg.mk Thu Nov 15 16:11:45 2012 -0500 @@ -21,7 +21,7 @@ AR='$(TARGET)-ar' \ NM='$(TARGET)-nm' \ --host='$(TARGET)' \ - --disable-shared \ + $(ENABLE_SHARED_OR_STATIC) \ --disable-debug \ --prefix='$(PREFIX)/$(TARGET)' \ --with-sdl-prefix='$(PREFIX)/$(TARGET)' \ diff -r 54522aaf400c -r 47558e958113 src/sox.mk --- a/src/sox.mk Wed Nov 14 10:53:53 2012 +0100 +++ b/src/sox.mk Thu Nov 15 16:11:45 2012 -0500 @@ -27,7 +27,7 @@ --host='$(TARGET)' \ --prefix='$(PREFIX)/$(TARGET)' \ --build="`config.guess`" \ - --disable-shared + $(ENABLE_SHARED_OR_STATIC) $(MAKE) -C '$(1)' -j '$(JOBS)' bin_PROGRAMS= EXTRA_PROGRAMS= $(MAKE) -C '$(1)' -j 1 install diff -r 54522aaf400c -r 47558e958113 src/speex.mk --- a/src/speex.mk Wed Nov 14 10:53:53 2012 +0100 +++ b/src/speex.mk Thu Nov 15 16:11:45 2012 -0500 @@ -19,7 +19,7 @@ define $(PKG)_BUILD cd '$(1)' && ./configure \ --host='$(TARGET)' \ - --disable-shared \ + $(ENABLE_SHARED_OR_STATIC) \ --prefix='$(PREFIX)/$(TARGET)' \ --disable-oggtest $(MAKE) -C '$(1)' -j '$(JOBS)' bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= man_MANS= doc_DATA= diff -r 54522aaf400c -r 47558e958113 src/sqlite.mk --- a/src/sqlite.mk Wed Nov 14 10:53:53 2012 +0100 +++ b/src/sqlite.mk Thu Nov 15 16:11:45 2012 -0500 @@ -19,7 +19,7 @@ cd '$(1)' && ./configure \ --host='$(TARGET)' \ --build="`config.guess`" \ - --disable-shared \ + $(ENABLE_SHARED_OR_STATIC) \ --prefix='$(PREFIX)/$(TARGET)' \ --disable-readline \ --disable-threadsafe diff -r 54522aaf400c -r 47558e958113 src/t4k_common.mk --- a/src/t4k_common.mk Wed Nov 14 10:53:53 2012 +0100 +++ b/src/t4k_common.mk Thu Nov 15 16:11:45 2012 -0500 @@ -18,7 +18,7 @@ define $(PKG)_BUILD cd '$(1)' && ./configure \ --host='$(TARGET)' \ - --disable-shared \ + $(ENABLE_SHARED_OR_STATIC) \ --prefix='$(PREFIX)/$(TARGET)' \ --with-sdlpango \ --with-sdlnet \ diff -r 54522aaf400c -r 47558e958113 src/theora.mk --- a/src/theora.mk Wed Nov 14 10:53:53 2012 +0100 +++ b/src/theora.mk Thu Nov 15 16:11:45 2012 -0500 @@ -19,7 +19,7 @@ cd '$(1)' && ./configure \ --host='$(TARGET)' \ --build="`config.guess`" \ - --disable-shared \ + $(ENABLE_SHARED_OR_STATIC) \ --prefix='$(PREFIX)/$(TARGET)' $(MAKE) -C '$(1)' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= doc_DATA= endef diff -r 54522aaf400c -r 47558e958113 src/tiff.mk --- a/src/tiff.mk Wed Nov 14 10:53:53 2012 +0100 +++ b/src/tiff.mk Thu Nov 15 16:11:45 2012 -0500 @@ -20,7 +20,7 @@ cd '$(1)' && ./configure \ --host='$(TARGET)' \ --build="`config.guess`" \ - --disable-shared \ + $(ENABLE_SHARED_OR_STATIC) \ --prefix='$(PREFIX)/$(TARGET)' \ --without-x $(MAKE) -C '$(1)' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= diff -r 54522aaf400c -r 47558e958113 src/tre.mk --- a/src/tre.mk Wed Nov 14 10:53:53 2012 +0100 +++ b/src/tre.mk Thu Nov 15 16:11:45 2012 -0500 @@ -19,7 +19,7 @@ define $(PKG)_BUILD cd '$(1)' && ./configure \ --host='$(TARGET)' \ - --disable-shared \ + $(ENABLE_SHARED_OR_STATIC) \ --prefix='$(PREFIX)/$(TARGET)' \ --disable-nls $(MAKE) -C '$(1)' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= diff -r 54522aaf400c -r 47558e958113 src/vorbis.mk --- a/src/vorbis.mk Wed Nov 14 10:53:53 2012 +0100 +++ b/src/vorbis.mk Thu Nov 15 16:11:45 2012 -0500 @@ -19,7 +19,7 @@ cd '$(1)' && ./configure \ --host='$(TARGET)' \ --build="`config.guess`" \ - --disable-shared \ + $(ENABLE_SHARED_OR_STATIC) \ --prefix='$(PREFIX)/$(TARGET)' \ PKG_CONFIG='$(TARGET)-pkg-config' $(MAKE) -C '$(1)' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= diff -r 54522aaf400c -r 47558e958113 src/wxwidgets.mk --- a/src/wxwidgets.mk Wed Nov 14 10:53:53 2012 +0100 +++ b/src/wxwidgets.mk Thu Nov 15 16:11:45 2012 -0500 @@ -21,7 +21,7 @@ cd '$(1)' && ./configure \ --host='$(TARGET)' \ --build="`config.guess`" \ - --disable-shared \ + $(ENABLE_SHARED_OR_STATIC) \ --prefix='$(PREFIX)/$(TARGET)' \ --enable-compat24 \ --enable-compat26 \ @@ -70,7 +70,7 @@ cd '$(1)/$(wxwidgets_SUBDIR)' && ./configure \ --host='$(TARGET)' \ --build="`config.guess`" \ - --disable-shared \ + $(ENABLE_SHARED_OR_STATIC) \ --prefix='$(PREFIX)/$(TARGET)' \ --enable-compat24 \ --enable-compat26 \ diff -r 54522aaf400c -r 47558e958113 src/x264.mk --- a/src/x264.mk Wed Nov 14 10:53:53 2012 +0100 +++ b/src/x264.mk Thu Nov 15 16:11:45 2012 -0500 @@ -18,8 +18,7 @@ --cross-prefix='$(TARGET)'- \ --host='$(TARGET)' \ --prefix='$(PREFIX)/$(TARGET)' \ - --disable-shared \ - --enable-static \ + $(ENABLE_SHARED_OR_STATIC) \ --enable-win32thread $(MAKE) -C '$(1)' -j 1 uninstall $(MAKE) -C '$(1)' -j '$(JOBS)' diff -r 54522aaf400c -r 47558e958113 src/xapian-core.mk --- a/src/xapian-core.mk Wed Nov 14 10:53:53 2012 +0100 +++ b/src/xapian-core.mk Thu Nov 15 16:11:45 2012 -0500 @@ -20,6 +20,6 @@ --host='$(TARGET)' \ --build="`config.guess`" \ --prefix='$(PREFIX)/$(TARGET)' \ - --enable-static + $(ENABLE_SHARED_OR_STATC) $(MAKE) -C '$(1)' -j '$(JOBS)' install endef diff -r 54522aaf400c -r 47558e958113 src/xerces.mk --- a/src/xerces.mk Wed Nov 14 10:53:53 2012 +0100 +++ b/src/xerces.mk Thu Nov 15 16:11:45 2012 -0500 @@ -20,7 +20,7 @@ define $(PKG)_BUILD cd '$(1)' && CONFIG_SHELL='$(SHELL)' ./configure \ --host='$(TARGET)' \ - --disable-shared \ + $(ENABLE_SHARED_OR_STATIC) \ --disable-sse2 \ --prefix='$(PREFIX)/$(TARGET)' \ --enable-libtool-lock \ diff -r 54522aaf400c -r 47558e958113 src/xine-lib.mk --- a/src/xine-lib.mk Wed Nov 14 10:53:53 2012 +0100 +++ b/src/xine-lib.mk Thu Nov 15 16:11:45 2012 -0500 @@ -25,8 +25,7 @@ cd '$(1)' && ./configure \ --host='$(TARGET)' \ --prefix='$(PREFIX)/$(TARGET)' \ - --enable-static \ - --disable-shared \ + $(ENABLE_SHARED_OR_STATIC) \ --disable-mmap \ --disable-nls \ --disable-aalib \ diff -r 54522aaf400c -r 47558e958113 src/xmlwrapp.mk --- a/src/xmlwrapp.mk Wed Nov 14 10:53:53 2012 +0100 +++ b/src/xmlwrapp.mk Thu Nov 15 16:11:45 2012 -0500 @@ -18,7 +18,7 @@ define $(PKG)_BUILD cd '$(1)' && ./configure \ --host='$(TARGET)' \ - --disable-shared \ + $(ENABLE_SHARED_OR_STATIC) \ --prefix='$(PREFIX)/$(TARGET)' \ PKG_CONFIG='$(TARGET)-pkg-config' $(MAKE) -C '$(1)' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= html_DATA= diff -r 54522aaf400c -r 47558e958113 src/xz.mk --- a/src/xz.mk Wed Nov 14 10:53:53 2012 +0100 +++ b/src/xz.mk Thu Nov 15 16:11:45 2012 -0500 @@ -20,7 +20,7 @@ --host='$(TARGET)' \ --build="`config.guess`" \ --prefix='$(PREFIX)/$(TARGET)' \ - --disable-shared \ + $(ENABLE_SHARED_OR_STATIC) \ --disable-threads \ --disable-nls $(MAKE) -C '$(1)'/src/liblzma -j '$(JOBS)' install diff -r 54522aaf400c -r 47558e958113 src/zlib.mk --- a/src/zlib.mk Wed Nov 14 10:53:53 2012 +0100 +++ b/src/zlib.mk Thu Nov 15 16:11:45 2012 -0500 @@ -9,6 +9,9 @@ $(PKG)_URL := http://zlib.net/$($(PKG)_FILE) $(PKG)_URL_2 := http://$(SOURCEFORGE_MIRROR)/project/libpng/$(PKG)/$($(PKG)_VERSION)/$($(PKG)_FILE) $(PKG)_DEPS := gcc +ifneq ($(BUILD_SHARED),yes) +$(PKG)_STATIC_FLAG := -static +endif define $(PKG)_UPDATE $(WGET) -q -O- 'http://zlib.net/' | \ @@ -19,6 +22,6 @@ define $(PKG)_BUILD cd '$(1)' && CHOST='$(TARGET)' ./configure \ --prefix='$(PREFIX)/$(TARGET)' \ - --static + $($(PKG)_STATIC_FLAG) $(MAKE) -C '$(1)' -j '$(JOBS)' install endef diff -r 54522aaf400c -r 47558e958113 src/zziplib.mk --- a/src/zziplib.mk Wed Nov 14 10:53:53 2012 +0100 +++ b/src/zziplib.mk Thu Nov 15 16:11:45 2012 -0500 @@ -21,7 +21,7 @@ cd '$(1)' && ./configure \ --host='$(TARGET)' \ --disable-mmap \ - --disable-shared \ + $(ENABLE_SHARED_OR_STATIC) \ --prefix='$(PREFIX)/$(TARGET)' \ PKG_CONFIG='$(TARGET)-pkg-config' $(MAKE) -C '$(1)' -j '$(JOBS)' bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS=