various packages: enable shared builds

2014-02-10 16:33:26 +11:00 · 2014-02-10 16:33:26 +11:00 · c950f3635c
parent 6e81d8db34
commit c950f3635c
31 changed files with 54 additions and 97 deletions
--- a/1
+++ b/1
@ -287,6 +287,7 @@ $(PREFIX)/$(3)/installed/$(1): $(TOP_DIR)/src/$(1).mk \
 build-only-$(1)_$(3): PKG = $(1)
 build-only-$(1)_$(3): TARGET = $(3)
 build-only-$(1)_$(3): BUILD_$(if $(findstring shared,$(3)),SHARED,STATIC) = TRUE
+build-only-$(1)_$(3): LIB_SUFFIX = $(if $(findstring shared,$(3)),dll,a)
 build-only-$(1)_$(3): CMAKE_TOOLCHAIN_FILE = $(PREFIX)/$(3)/share/cmake/mxe-conf.cmake
 build-only-$(1)_$(3):
 	$(if $(value $(call LOOKUP_PKG_RULE,$(1),BUILD,$(3))),
--- a/src/cairo.mk
+++ b/src/cairo.mk
@ -42,7 +42,7 @@ define $(PKG)_BUILD
        --enable-pdf \
        --enable-svg \
        --disable-pthread \
-        CFLAGS="$(CFLAGS) -DCAIRO_WIN32_STATIC_BUILD" \
+        CFLAGS="$(CFLAGS) $(if $(BUILD_STATIC),-DCAIRO_WIN32_STATIC_BUILD)" \
        LIBS="-lmsimg32 -lgdi32 `$(TARGET)-pkg-config pixman-1 --libs`"
    $(MAKE) -C '$(1)' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS=
 endef
--- a/src/dlfcn-win32.mk
+++ b/src/dlfcn-win32.mk
@ -20,7 +20,9 @@ define $(PKG)_BUILD
    cd '$(1)' && ./configure \
        --prefix='$(PREFIX)/$(TARGET)' \
        --cross-prefix='$(TARGET)-' \
-        --disable-shared
+        $(if $(BUILD_STATIC), \
+            --enable-static --disable-shared , \
+            --disable-static --enable-shared )
    $(MAKE) -C '$(1)' -j '$(JOBS)'
    $(MAKE) -C '$(1)' -j 1 install

--- a/src/faad2.mk
+++ b/src/faad2.mk
@ -18,10 +18,7 @@ endef

 define $(PKG)_BUILD
    cd '$(1)' && ./configure \
-        --host='$(TARGET)' \
-        --prefix='$(PREFIX)/$(TARGET)' \
-        --disable-shared
-    $(MAKE) -C '$(1)' -j '$(JOBS)'
-    $(MAKE) -C '$(1)' -j 1 install
+        $(MXE_CONFIGURE_OPTS)
+    $(MAKE) -C '$(1)' -j '$(JOBS)' LDFLAGS='-no-undefined'
+    $(MAKE) -C '$(1)' -j 1 install LDFLAGS='-no-undefined'
 endef
-
--- a/src/ffmpeg.mk
+++ b/src/ffmpeg.mk
@ -27,7 +27,9 @@ define $(PKG)_BUILD
        --arch=$(patsubst -%,,$(TARGET)) \
        --target-os=mingw32 \
        --prefix='$(PREFIX)/$(TARGET)' \
-        --disable-shared \
+        $(if $(BUILD_STATIC), \
+            --enable-static --disable-shared , \
+            --disable-static --enable-shared ) \
        --disable-debug \
        --enable-memalign-hack \
        --disable-pthreads \
--- a/src/fribidi.mk
+++ b/src/fribidi.mk
@ -17,7 +17,8 @@ define $(PKG)_UPDATE
 endef

 define $(PKG)_BUILD
-    $(SED) -i 's,__declspec(dllimport),,' '$(1)/lib/fribidi-common.h'
+    $(if $(BUILD_STATIC),\
+        $(SED) -i 's/__declspec(dllimport)//' '$(1)/lib/fribidi-common.h')
    cd '$(1)' && ./configure \
        $(MXE_CONFIGURE_OPTS) \
        --disable-debug \
--- a/src/icu4c-2-dll_fix.patch
+++ b/src/icu4c-2-dll_fix.patch
@ -1,3 +1,6 @@
+This file is part of MXE.
+See index.html for further information.
+
 diff -urN icu/source/extra/uconv/uconv.cpp icu-patch/source/extra/uconv/uconv.cpp
 --- icu/source/extra/uconv/uconv.cpp	2013-10-04 23:48:58.000000000 +0300
 +++ icu-patch/source/extra/uconv/uconv.cpp	2013-12-15 15:04:00.758431267 +0200
--- a/src/lame.mk
+++ b/src/lame.mk
@ -21,10 +21,7 @@ endef

 define $(PKG)_BUILD
    cd '$(1)' && ./configure \
-        --host='$(TARGET)' \
-        --build="`config.guess`" \
-        --prefix='$(PREFIX)/$(TARGET)' \
-        --disable-shared
+        $(MXE_CONFIGURE_OPTS)
    $(MAKE) -C '$(1)' -j '$(JOBS)' MXE_CFLAGS=
    $(MAKE) -C '$(1)' -j 1 install
 endef
--- a/src/libcdio.mk
+++ b/src/libcdio.mk
@ -17,8 +17,6 @@ endef

 define $(PKG)_BUILD
    cd '$(1)' && ./configure \
-        --host='$(TARGET)' \
-        --disable-shared \
-        --prefix='$(PREFIX)/$(TARGET)'
+        $(MXE_CONFIGURE_OPTS)
    $(MAKE) -C '$(1)' -j 1 install
 endef
--- a/src/libffi.mk
+++ b/src/libffi.mk
@ -19,9 +19,7 @@ endef

 define $(PKG)_BUILD
    cd '$(1)' && ./configure \
-        --host='$(TARGET)' \
-        --prefix='$(PREFIX)/$(TARGET)' \
-        --disable-shared
+        $(MXE_CONFIGURE_OPTS)
    $(MAKE) -C '$(1)/$(TARGET)' -j '$(JOBS)'
    $(MAKE) -C '$(1)/$(TARGET)' -j 1 install

--- a/src/libltdl.mk
+++ b/src/libltdl.mk
@ -16,9 +16,7 @@ endef

 define $(PKG)_BUILD
    cd '$(1)/libltdl' && ./configure \
-        --host='$(TARGET)' \
-        --prefix='$(PREFIX)/$(TARGET)' \
-        --disable-shared \
+        $(MXE_CONFIGURE_OPTS) \
        --enable-ltdl-install
    $(MAKE) -C '$(1)/libltdl' -j '$(JOBS)'
    $(MAKE) -C '$(1)/libltdl' -j 1 install
--- a/src/libmad.mk
+++ b/src/libmad.mk
@ -19,8 +19,6 @@ endef
 define $(PKG)_BUILD
    $(SED) -i '/-fforce-mem/d' '$(1)'/configure
    cd '$(1)' && ./configure \
-        --host='$(TARGET)' \
-        --disable-shared \
-        --prefix='$(PREFIX)/$(TARGET)'
-    $(MAKE) -C '$(1)' -j '$(JOBS)' install
+        $(MXE_CONFIGURE_OPTS)
+    $(MAKE) -C '$(1)' -j '$(JOBS)' install LDFLAGS='-no-undefined'
 endef
--- a/src/libmpcdec.mk
+++ b/src/libmpcdec.mk
@ -24,8 +24,6 @@ define $(PKG)_BUILD
    cd '$(1)' && libtoolize
    cd '$(1)' && autoreconf
    cd '$(1)' && ./configure \
-        --host='$(TARGET)' \
-        --disable-shared \
-        --prefix='$(PREFIX)/$(TARGET)'
+        $(MXE_CONFIGURE_OPTS)
    $(MAKE) -C '$(1)' -j 1 install
 endef
--- a/src/libsamplerate.mk
+++ b/src/libsamplerate.mk
@ -11,7 +11,7 @@ $(PKG)_URL      := http://www.mega-nerd.com/SRC/$(PKG)-$($(PKG)_VERSION).tar.gz
 $(PKG)_DEPS     := gcc

 define $(PKG)_UPDATE
-    $(WGET) -q -O- 'http://www.mega-nerd.com/SRC/$(PKG)-$($(PKG)_VERSION)' | \
+    $(WGET) -q -O- 'http://www.mega-nerd.com/SRC/download.html' | \
    $(SED) -n 's,.*$(PKG)-\([0-9][^>]*\)\.tar.*,\1,p' | \
    grep -v 'alpha' | \
    grep -v 'beta' | \
@ -21,6 +21,6 @@ endef

 define $(PKG)_BUILD
    cd '$(1)' && ./configure \
-    $(MXE_CONFIGURE_OPTS)
-    $(MAKE) -C '$(1)' -j 1 install LDFLAGS="-no-undefined"
+        $(MXE_CONFIGURE_OPTS)
+    $(MAKE) -C '$(1)' -j 1 install LDFLAGS='-no-undefined'
 endef
--- a/src/libusb1.mk
+++ b/src/libusb1.mk
@ -18,10 +18,6 @@ endef

 define $(PKG)_BUILD
    cd '$(1)' && ./configure \
-        --host='$(TARGET)' \
-        --build="`config.guess`" \
-        --disable-shared \
-        --enable-static \
-        --prefix='$(PREFIX)/$(TARGET)'
+        $(MXE_CONFIGURE_OPTS)
    $(MAKE) -C '$(1)' -j '$(JOBS)' install
 endef
--- a/src/mman-win32.mk
+++ b/src/mman-win32.mk
@ -19,12 +19,10 @@ define $(PKG)_BUILD
    cd '$(1)' && chmod +x configure
    cd '$(1)' && ./configure \
        --cross-prefix='$(TARGET)'- \
-        --enable-static \
+        $(if $(BUILD_STATIC),--enable-static ) \
        --prefix='$(PREFIX)/$(TARGET)' \
        --libdir='$(PREFIX)/$(TARGET)/lib' \
        --incdir='$(PREFIX)/$(TARGET)/include/sys'
    $(MAKE) -C '$(1)' -j 1
    $(MAKE) -C '$(1)' -j 1 install
 endef
-
-
--- a/src/ogg.mk
+++ b/src/ogg.mk
@ -18,10 +18,7 @@ endef

 define $(PKG)_BUILD
    cd '$(1)' && ./configure \
-        --host='$(TARGET)' \
-        --build="`config.guess`" \
-        --disable-shared \
-        --prefix='$(PREFIX)/$(TARGET)'
+        $(MXE_CONFIGURE_OPTS)
    $(MAKE) -C '$(1)' -j '$(JOBS)' bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS=
    $(MAKE) -C '$(1)' -j 1 install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS=
 endef
--- a/src/opencore-amr.mk
+++ b/src/opencore-amr.mk
@ -18,9 +18,7 @@ endef

 define $(PKG)_BUILD
    cd '$(1)' && ./configure \
-        --host='$(TARGET)' \
-        --prefix='$(PREFIX)/$(TARGET)' \
-        --disable-shared
+        $(MXE_CONFIGURE_OPTS)
    $(MAKE) -C '$(1)' -j '$(JOBS)'
    $(MAKE) -C '$(1)' -j 1 install
 endef
--- a/src/opus.mk
+++ b/src/opus.mk
@ -22,10 +22,7 @@ endef

 define $(PKG)_BUILD
    cd '$(1)' && ./configure \
-        --host='$(TARGET)' \
-        --build="`config.guess`" \
-        --disable-shared \
-        --prefix='$(PREFIX)/$(TARGET)'
+        $(MXE_CONFIGURE_OPTS)
    $(MAKE) -C '$(1)' -j '$(JOBS)' bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS=
    $(MAKE) -C '$(1)' -j 1 install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS=
 endef
--- a/src/pixman.mk
+++ b/src/pixman.mk
@ -19,9 +19,6 @@ endef

 define $(PKG)_BUILD
    cd '$(1)' && ./configure \
-        --host='$(TARGET)' \
-        --build="`config.guess`" \
-        --disable-shared \
-        --prefix='$(PREFIX)/$(TARGET)'
+        $(MXE_CONFIGURE_OPTS)
    $(MAKE) -C '$(1)' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS=
 endef
--- a/src/pkgconf.mk
+++ b/src/pkgconf.mk
@ -50,6 +50,7 @@ define $(PKG)_BUILD_COMMON
    (echo 'set(CMAKE_SYSTEM_NAME Windows)'; \
     echo 'set(MSYS 1)'; \
     echo 'set(BUILD_SHARED_LIBS $(if $(BUILD_SHARED),ON,OFF))'; \
+     echo 'set(LIBTYPE $(if $(BUILD_SHARED),SHARED,STATIC))'; \
     echo 'set(CMAKE_BUILD_TYPE Release)'; \
     echo 'set(CMAKE_FIND_ROOT_PATH $(PREFIX)/$(TARGET))'; \
     echo 'set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)'; \
--- a/src/portmidi.mk
+++ b/src/portmidi.mk
@ -20,15 +20,14 @@ endef
 define $(PKG)_BUILD
    mkdir '$(1)/build'
    cd '$(1)/build' && cmake .. \
-        -DCMAKE_TOOLCHAIN_FILE='$(CMAKE_TOOLCHAIN_FILE)' \
-        -DLIBTYPE=STATIC
+        -DCMAKE_TOOLCHAIN_FILE='$(CMAKE_TOOLCHAIN_FILE)'

-    $(MAKE) -C '$(1)/build' -j '$(JOBS)' portmidi-static
+    $(MAKE) -C '$(1)/build' -j '$(JOBS)' portmidi-$(if $(BUILD_STATIC),static,dynamic)

    # install library files
    $(INSTALL) -d '$(PREFIX)/$(TARGET)/lib'
-    $(INSTALL) -m644 '$(1)/build/libportmidi_s.a' \
-                     '$(PREFIX)/$(TARGET)/lib/libportmidi.a'
+    $(INSTALL) -m644 '$(1)/build/libportmidi$(if $(BUILD_STATIC),_s).$(LIB_SUFFIX)' \
+                     '$(PREFIX)/$(TARGET)/lib/libportmidi.$(LIB_SUFFIX)'

    # install include files
    $(INSTALL) -d                                '$(PREFIX)/$(TARGET)/include'
--- a/src/protobuf.mk
+++ b/src/protobuf.mk
@ -26,9 +26,7 @@ define $(PKG)_BUILD
    $(MAKE) -C '$(1)' -j 1 distclean
 # Second step: Build for target system.
    cd '$(1)' && ./configure \
-        --host='$(TARGET)' \
-        --prefix='$(PREFIX)/$(TARGET)' \
-        --disable-shared \
+        $(MXE_CONFIGURE_OPTS) \
        --with-zlib \
        --with-protoc=src/protoc_host
    $(MAKE) -C '$(1)' -j '$(JOBS)'
--- a/src/theora.mk
+++ b/src/theora.mk
@ -17,10 +17,10 @@ define $(PKG)_UPDATE
 endef

 define $(PKG)_BUILD
+    # https://aur.archlinux.org/packages/mi/mingw-w64-libtheora/PKGBUILD
+    $(SED) -i 's,EXPORTS,,' '$(1)/win32/xmingw32/libtheoradec-all.def'
+    $(SED) -i 's,EXPORTS,,' '$(1)/win32/xmingw32/libtheoraenc-all.def'
    cd '$(1)' && ./configure \
-        --host='$(TARGET)' \
-        --build="`config.guess`" \
-        --disable-shared \
-        --prefix='$(PREFIX)/$(TARGET)'
+        $(MXE_CONFIGURE_OPTS)
    $(MAKE) -C '$(1)' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= doc_DATA=
 endef
--- a/src/vcdimager.mk
+++ b/src/vcdimager.mk
@ -8,7 +8,7 @@ $(PKG)_CHECKSUM := 8c245555c3e21dcbc3d4dbb2ecca74f609545424
 $(PKG)_SUBDIR   := $(PKG)-$($(PKG)_VERSION)
 $(PKG)_FILE     := $(PKG)-$($(PKG)_VERSION).tar.gz
 $(PKG)_URL      := http://ftp.gnu.org/gnu/vcdimager/$(PKG)-$($(PKG)_VERSION).tar.gz
-$(PKG)_DEPS     := gcc popt libxml2
+$(PKG)_DEPS     := gcc libcdio libxml2 popt

 define $(PKG)_UPDATE
    echo 'TODO: Updates for package vcdimager need to be written.' >&2;
@ -18,8 +18,6 @@ endef
 define $(PKG)_BUILD
    cd '$(1)' && autoconf
    cd '$(1)' && ./configure \
-        --host='$(TARGET)' \
-        --disable-shared \
-        --prefix='$(PREFIX)/$(TARGET)'
+        $(MXE_CONFIGURE_OPTS)
    $(MAKE) -C '$(1)' -j 1 install
 endef
--- a/src/vo-aacenc.mk
+++ b/src/vo-aacenc.mk
@ -19,9 +19,7 @@ endef

 define $(PKG)_BUILD
    cd '$(1)' && ./configure \
-        --host='$(TARGET)' \
-        --prefix='$(PREFIX)/$(TARGET)' \
-        --disable-shared
+        $(MXE_CONFIGURE_OPTS)
    $(MAKE) -C '$(1)' -j '$(JOBS)'
    $(MAKE) -C '$(1)' -j 1 install
 endef
--- a/src/vo-amrwbenc.mk
+++ b/src/vo-amrwbenc.mk
@ -19,9 +19,7 @@ endef

 define $(PKG)_BUILD
    cd '$(1)' && ./configure \
-        --host='$(TARGET)' \
-        --prefix='$(PREFIX)/$(TARGET)' \
-        --disable-shared
+        $(MXE_CONFIGURE_OPTS)
    $(MAKE) -C '$(1)' -j '$(JOBS)'
    $(MAKE) -C '$(1)' -j 1 install
 endef
--- a/src/vorbis.mk
+++ b/src/vorbis.mk
@ -18,10 +18,7 @@ endef

 define $(PKG)_BUILD
    cd '$(1)' && ./configure \
-        --host='$(TARGET)' \
-        --build="`config.guess`" \
-        --disable-shared \
-        --prefix='$(PREFIX)/$(TARGET)' \
+        $(MXE_CONFIGURE_OPTS) \
        PKG_CONFIG='$(TARGET)-pkg-config'
    $(MAKE) -C '$(1)' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS=
 endef
--- a/src/winpthreads.mk
+++ b/src/winpthreads.mk
@ -19,10 +19,7 @@ endef

 define $(PKG)_BUILD_mingw-w64
    cd '$(1)/mingw-w64-libraries/winpthreads' && ./configure \
-        --host='$(TARGET)' \
-        --prefix='$(PREFIX)/$(TARGET)' \
-        --enable-static \
-        --disable-shared
+        $(MXE_CONFIGURE_OPTS)
    $(MAKE) -C '$(1)/mingw-w64-libraries/winpthreads' -j '$(JOBS)' install

    $(PTHREADS_TEST)
--- a/src/x264.mk
+++ b/src/x264.mk
@ -17,13 +17,10 @@ endef
 define $(PKG)_BUILD
    $(SED) -i 's,yasm,$(TARGET)-yasm,g' '$(1)/configure'
    cd '$(1)' && ./configure \
+        $(MXE_CONFIGURE_OPTS) \
        --cross-prefix='$(TARGET)'- \
-        --host='$(TARGET)' \
-        --prefix='$(PREFIX)/$(TARGET)' \
-        --disable-shared \
-        --enable-static \
        --enable-win32thread \
-        --disable-lavf \    # Avoid circular dependency with ffmpeg. Remove if undesired.
+        --disable-lavf \
        --disable-swscale   # Avoid circular dependency with ffmpeg. Remove if undesired.
    $(MAKE) -C '$(1)' -j 1 uninstall
    $(MAKE) -C '$(1)' -j '$(JOBS)'
--- a/src/xvidcore.mk
+++ b/src/xvidcore.mk
@ -19,15 +19,13 @@ endef
 define $(PKG)_BUILD
    cd '$(1)' && autoconf
    cd '$(1)' && ./configure \
-        --host='$(TARGET)' \
-        --build="`config.guess`" \
-        --prefix='$(PREFIX)/$(TARGET)'
-    $(MAKE) -C '$(1)' -j 1 BUILD_DIR='build' SHARED_LIB=
+        $(MXE_CONFIGURE_OPTS)
+    $(MAKE) -C '$(1)' -j 1 BUILD_DIR='build' $(if $(BUILD_STATIC),SHARED,STATIC)_LIB=
    $(INSTALL) -d '$(PREFIX)/$(TARGET)/include'
    $(INSTALL) -m644 '$(1)/../../src/xvid.h' '$(PREFIX)/$(TARGET)/include/'
    $(INSTALL) -d '$(PREFIX)/$(TARGET)/lib'
-    $(INSTALL) -m644 '$(1)/build/xvidcore.a' '$(PREFIX)/$(TARGET)/lib/'
-    ln -sf '$(PREFIX)/$(TARGET)/lib/xvidcore.a' '$(PREFIX)/$(TARGET)/lib/libxvidcore.a'
+    $(INSTALL) -m644 '$(1)/build/xvidcore.$(LIB_SUFFIX)' '$(PREFIX)/$(TARGET)/lib/'
+    ln -sf '$(PREFIX)/$(TARGET)/lib/xvidcore.$(LIB_SUFFIX)' '$(PREFIX)/$(TARGET)/lib/libxvidcore.$(LIB_SUFFIX)'
 endef

 define $(PKG)_BUILD_x86_64-w64-mingw32