sdl pkgs: enable shared

2017-11-26 18:19:42 +11:00 · 2017-11-26 18:19:42 +11:00 · 0837aae2ef
parent 640a1b3a5e
commit 0837aae2ef
7 changed files with 75 additions and 78 deletions
--- a/src/sdl_image.mk
+++ b/src/sdl_image.mk
@ -20,31 +20,29 @@ define $(PKG)_UPDATE
 endef

 define $(PKG)_BUILD
-    $(SED) -i 's,^\(Requires:.*\),\1 libtiff-4 libpng libwebp,' '$(1)/SDL_image.pc.in'
-    cd '$(1)' && ./configure \
-        --host='$(TARGET)' \
-        --disable-shared \
-        --prefix='$(PREFIX)/$(TARGET)' \
+    $(SED) -i 's,^\(Requires:.*\),\1 libtiff-4 libpng libwebp,' '$(SOURCE_DIR)/SDL_image.pc.in'
+    cd '$(BUILD_DIR)' && '$(SOURCE_DIR)/configure' \
+        $(MXE_CONFIGURE_OPTS) \
        --with-sdl-prefix='$(PREFIX)/$(TARGET)' \
        --disable-sdltest \
-        --disable-jpg-shared \
-        --disable-png-shared \
-        --disable-tif-shared \
-        --disable-webp-shared \
+        $(if $(BUILD_STATIC), \
+            --disable-jpg-shared \
+            --disable-png-shared \
+            --disable-tif-shared \
+            --disable-webp-shared) \
        WINDRES='$(TARGET)-windres' \
        LIBS='-lz'
-    $(MAKE) -C '$(1)' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS=
+    $(MAKE) -C '$(BUILD_DIR)' -j '$(JOBS)' $(MXE_DISABLE_PROGRAMS)
+    $(MAKE) -C '$(BUILD_DIR)' -j 1 install $(MXE_DISABLE_PROGRAMS)

    '$(TARGET)-gcc' \
        -W -Wall -Werror -ansi -pedantic \
        '$(PWD)/src/$(PKG)-test.c' -o '$(PREFIX)/$(TARGET)/bin/test-sdl_image.exe' \
        `'$(TARGET)-pkg-config' SDL_image --cflags --libs`

-    mkdir -p '$(1)/cmake-build-test'
-    cp '$(PWD)/src/$(PKG)-test-CMakeLists.txt' '$(1)/cmake-build-test/CMakeLists.txt'
-    cp '$(PWD)/src/$(PKG)-test.c' '$(1)/cmake-build-test/'
-    cd '$(1)/cmake-build-test' && '$(TARGET)-cmake'
-    $(MAKE) -C '$(1)/cmake-build-test' -j '$(JOBS)'
+    mkdir -p '$(BUILD_DIR).cmake-build-test'
+    cp '$(PWD)/src/$(PKG)-test-CMakeLists.txt' '$(BUILD_DIR).cmake-build-test/CMakeLists.txt'
+    cp '$(PWD)/src/$(PKG)-test.c' '$(BUILD_DIR).cmake-build-test/'
+    cd '$(BUILD_DIR).cmake-build-test' && '$(TARGET)-cmake'
+    $(MAKE) -C '$(BUILD_DIR).cmake-build-test' -j '$(JOBS)'
 endef
-
-$(PKG)_BUILD_SHARED =
--- a/src/sdl_mixer.mk
+++ b/src/sdl_mixer.mk
@ -20,17 +20,15 @@ define $(PKG)_UPDATE
 endef

 define $(PKG)_BUILD
-    $(SED) -i 's,^\(Requires:.*\),\1 vorbisfile,' '$(1)/SDL_mixer.pc.in'
+    $(SED) -i 's,^\(Requires:.*\),\1 vorbisfile,' '$(SOURCE_DIR)/SDL_mixer.pc.in'
    echo \
        'Libs.private:' \
        "`$(TARGET)-pkg-config libmodplug --libs`" \
        "`$(PREFIX)/$(TARGET)/bin/smpeg-config     --libs`" \
-        >> '$(1)/SDL_mixer.pc.in'
-    $(SED) -i 's,for path in /usr/local; do,for path in; do,' '$(1)/configure'
-    cd '$(1)' && ./configure \
-        --host='$(TARGET)' \
-        --disable-shared \
-        --prefix='$(PREFIX)/$(TARGET)' \
+        >> '$(SOURCE_DIR)/SDL_mixer.pc.in'
+    $(SED) -i 's,for path in /usr/local; do,for path in; do,' '$(SOURCE_DIR)/configure'
+    cd '$(BUILD_DIR)' && '$(SOURCE_DIR)/configure' \
+        $(MXE_CONFIGURE_OPTS) \
        --with-sdl-prefix='$(PREFIX)/$(TARGET)' \
        --disable-sdltest \
        --disable-music-mod \
@ -38,20 +36,22 @@ define $(PKG)_BUILD
        --enable-music-ogg \
        --disable-music-flac \
        --enable-music-mp3 \
-        --disable-music-mod-shared \
-        --disable-music-ogg-shared \
-        --disable-music-flac-shared \
-        --disable-music-mp3-shared \
-        --disable-smpegtest \
-        --with-smpeg-prefix='$(PREFIX)/$(TARGET)' \
+        $(if $(BUILD_STATIC), \
+            --disable-music-mod-shared \
+            --disable-music-ogg-shared \
+            --disable-music-flac-shared \
+            --disable-music-mp3-shared \
+            --disable-smpegtest \
+            --with-smpeg-prefix='$(PREFIX)/$(TARGET)' \
+            , \
+            --without-smpeg)
        WINDRES='$(TARGET)-windres' \
        LIBS='-lvorbis -logg'
-    $(MAKE) -C '$(1)' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS=
+    $(MAKE) -C '$(BUILD_DIR)' -j '$(JOBS)' $(if $(BUILD_SHARED),build/libSDL_mixer.la)
+    $(MAKE) -C '$(BUILD_DIR)' -j 1 install-hdrs install-lib

    '$(TARGET)-gcc' \
        -W -Wall -Werror -ansi -pedantic \
        '$(TEST_FILE)' -o '$(PREFIX)/$(TARGET)/bin/test-sdl_mixer.exe' \
        `'$(TARGET)-pkg-config' SDL_mixer --cflags --libs`
 endef
-
-$(PKG)_BUILD_SHARED =
--- a/src/sdl_net.mk
+++ b/src/sdl_net.mk
@ -18,20 +18,17 @@ define $(PKG)_UPDATE
 endef

 define $(PKG)_BUILD
-    cd '$(1)' && ./configure \
-        --host='$(TARGET)' \
-        --disable-shared \
-        --prefix='$(PREFIX)/$(TARGET)' \
+    cd '$(BUILD_DIR)' && '$(SOURCE_DIR)/configure' \
+        $(MXE_CONFIGURE_OPTS) \
        --with-sdl-prefix='$(PREFIX)/$(TARGET)' \
        --disable-sdltest \
        --disable-gui \
        WINDRES='$(TARGET)-windres'
-    $(MAKE) -C '$(1)' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS=
+    $(MAKE) -C '$(BUILD_DIR)' -j '$(JOBS)' $(MXE_DISABLE_PROGRAMS)
+    $(MAKE) -C '$(BUILD_DIR)' -j 1 install $(MXE_DISABLE_PROGRAMS)

    '$(TARGET)-gcc' \
        -W -Wall -Werror -ansi -pedantic \
        '$(TEST_FILE)' -o '$(PREFIX)/$(TARGET)/bin/test-sdl_net.exe' \
        `'$(TARGET)-pkg-config' SDL_net --cflags --libs`
 endef
-
-$(PKG)_BUILD_SHARED =
--- a/src/sdl_pango.mk
+++ b/src/sdl_pango.mk
@ -20,14 +20,14 @@ endef
 define $(PKG)_BUILD
    $(SED) -i 's,\r$$,,'                        '$(1)/SDL_Pango.pc.in'
    $(SED) -i 's,^\(Requires:.*\),\1 pangoft2,' '$(1)/SDL_Pango.pc.in'
-    cd '$(1)' && ./configure \
-        --host='$(TARGET)' \
-        --disable-shared \
-        --prefix='$(PREFIX)/$(TARGET)' \
+    cd '$(BUILD_DIR)' && '$(SOURCE_DIR)/configure' \
+        $(subst docdir$(comma),,$(MXE_CONFIGURE_OPTS)) \
        --with-sdl-prefix='$(PREFIX)/$(TARGET)' \
        --disable-sdltest \
-        PKG_CONFIG='$(TARGET)-pkg-config'
-    $(MAKE) -C '$(1)' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS=
+        PKG_CONFIG='$(TARGET)-pkg-config' \
+        $(if $(BUILD_SHARED),\
+            lt_cv_deplibs_check_method='file_magic file format (pe-i386|pe-x86-64)' \
+            lt_cv_file_magic_cmd='$$OBJDUMP -f')
+    $(MAKE) -C '$(BUILD_DIR)' -j '$(JOBS)' $(MXE_DISABLE_PROGRAMS)
+    $(MAKE) -C '$(BUILD_DIR)' -j 1 install $(MXE_DISABLE_PROGRAMS)
 endef
-
-$(PKG)_BUILD_SHARED =
--- a/src/sdl_sound.mk
+++ b/src/sdl_sound.mk
@ -18,10 +18,8 @@ define $(PKG)_UPDATE
 endef

 define $(PKG)_BUILD
-    cd '$(1)' && ./configure \
-        --host='$(TARGET)' \
-        --disable-shared \
-        --prefix='$(PREFIX)/$(TARGET)' \
+    cd '$(BUILD_DIR)' && '$(SOURCE_DIR)/configure' \
+        $(MXE_CONFIGURE_OPTS) \
        --with-sdl-prefix='$(PREFIX)/$(TARGET)' \
        --disable-sdltest \
        --enable-voc \
@ -33,7 +31,7 @@ define $(PKG)_BUILD
        --enable-midi \
        --disable-smpeg \
        --enable-mpglib \
-        --enable-mikmod \
+        --$(if $(BUILD_STATIC),en,dis)able-mikmod \
        --disable-modplug \
        --enable-ogg \
        --enable-flac \
@ -42,28 +40,32 @@ define $(PKG)_BUILD
        --disable-altcvt \
        CFLAGS='-g -O2 -fno-inline' \
        LIBS="`'$(TARGET)-pkg-config' vorbisfile flac speex --libs` `'$(PREFIX)/$(TARGET)/bin/libmikmod-config' --libs`"
-    $(MAKE) -C '$(1)' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS=
+    $(MAKE) -C '$(BUILD_DIR)' -j '$(JOBS)' $(MXE_DISABLE_PROGRAMS)
+    $(MAKE) -C '$(BUILD_DIR)' -j 1 install $(MXE_DISABLE_PROGRAMS)

    # create pkg-config file
    $(INSTALL) -d '$(PREFIX)/$(TARGET)/lib/pkgconfig'
    (echo 'Name: $(PKG)'; \
     echo 'Version: $($(PKG)_VERSION)'; \
     echo 'Description: $(PKG)'; \
-     echo 'Requires: sdl vorbisfile flac speex'; \
+     echo 'Requires: sdl vorbisfile flac speex ogg vorbis'; \
     echo 'Libs: -lSDL_sound'; \
     echo "Libs.private: `'$(PREFIX)/$(TARGET)/bin/libmikmod-config' --libs`";) \
     > '$(PREFIX)/$(TARGET)/lib/pkgconfig/SDL_sound.pc'

+    $(if $(BUILD_SHARED),\
+        rm -f '$(PREFIX)/$(TARGET)/lib/libSDL_sound.a' && \
+        $(MAKE_SHARED_FROM_STATIC) '$(BUILD_DIR)/.libs/libSDL_sound.a' \
+        `$(TARGET)-pkg-config SDL_sound --libs-only-l | $(SED) 's/-lSDL_sound//'`)
+
    '$(TARGET)-gcc' \
        -W -Wall -Werror -std=c99 -pedantic \
        '$(PWD)/src/$(PKG)-test.c' -o '$(PREFIX)/$(TARGET)/bin/test-sdl_sound.exe' \
        `'$(TARGET)-pkg-config' SDL_sound --cflags --libs`

-    mkdir -p '$(1)/cmake-build-test'
-    cp '$(PWD)/src/$(PKG)-test-CMakeLists.txt' '$(1)/cmake-build-test/CMakeLists.txt'
-    cp '$(PWD)/src/$(PKG)-test.c' '$(1)/cmake-build-test/'
-    cd '$(1)/cmake-build-test' && '$(TARGET)-cmake' .
-    $(MAKE) -C '$(1)/cmake-build-test' -j '$(JOBS)'
+    mkdir -p '$(BUILD_DIR).cmake-build-test'
+    cp '$(PWD)/src/$(PKG)-test-CMakeLists.txt' '$(BUILD_DIR).cmake-build-test/CMakeLists.txt'
+    cp '$(PWD)/src/$(PKG)-test.c' '$(BUILD_DIR).cmake-build-test/'
+    cd '$(BUILD_DIR).cmake-build-test' && '$(TARGET)-cmake' .
+    $(MAKE) -C '$(BUILD_DIR).cmake-build-test' -j '$(JOBS)'
 endef
-
-$(PKG)_BUILD_SHARED =
--- a/src/sdl_ttf.mk
+++ b/src/sdl_ttf.mk
@ -18,16 +18,13 @@ define $(PKG)_UPDATE
 endef

 define $(PKG)_BUILD
-    echo 'Requires.private: freetype2' >> '$(1)/SDL_ttf.pc.in'
-    cd '$(1)' && ./configure \
-        --host='$(TARGET)' \
-        --disable-shared \
-        --prefix='$(PREFIX)/$(TARGET)' \
+    echo 'Requires.private: freetype2' >> '$(SOURCE_DIR)/SDL_ttf.pc.in'
+    cd '$(BUILD_DIR)' && '$(SOURCE_DIR)/configure' \
+        $(MXE_CONFIGURE_OPTS) \
        --with-sdl-prefix='$(PREFIX)/$(TARGET)' \
        --disable-sdltest \
        --with-freetype-prefix='$(PREFIX)/$(TARGET)' \
        WINDRES='$(TARGET)-windres'
-    $(MAKE) -C '$(1)' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS=
+    $(MAKE) -C '$(BUILD_DIR)' -j '$(JOBS)' $(MXE_DISABLE_PROGRAMS)
+    $(MAKE) -C '$(BUILD_DIR)' -j 1 install $(MXE_DISABLE_PROGRAMS)
 endef
-
-$(PKG)_BUILD_SHARED =
--- a/src/smpeg.mk
+++ b/src/smpeg.mk
@ -17,25 +17,28 @@ define $(PKG)_UPDATE
 endef

 define $(PKG)_BUILD
-    $(SED) -i 's,\(-lsmpeg\),\1 -lstdc++,' '$(1)/smpeg-config.in'
-    cd '$(1)' && ./configure \
+    $(SED) -i 's,\(-lsmpeg\),\1 -lstdc++,' '$(SOURCE_DIR)/smpeg-config.in'
+    cd '$(BUILD_DIR)' && '$(SOURCE_DIR)/configure' \
+        $(subst docdir$(comma),,$(MXE_CONFIGURE_OPTS)) \
        AR='$(TARGET)-ar' \
        NM='$(TARGET)-nm' \
-        --host='$(TARGET)' \
-        --disable-shared \
        --disable-debug \
-        --prefix='$(PREFIX)/$(TARGET)' \
        --with-sdl-prefix='$(PREFIX)/$(TARGET)' \
        --disable-sdltest \
        --disable-gtk-player \
        --disable-opengl-player \
        CFLAGS='-ffriend-injection -Wno-narrowing'
-    $(MAKE) -C '$(1)' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS=
+    $(MAKE) -C '$(BUILD_DIR)' -j '$(JOBS)' $(MXE_DISABLE_PROGRAMS)
+    $(MAKE) -C '$(BUILD_DIR)' -j 1 install $(MXE_DISABLE_PROGRAMS)
+
+    $(if $(BUILD_SHARED),\
+        rm -f '$(PREFIX)/$(TARGET)/lib/libsmpeg.a' && \
+        $(MAKE_SHARED_FROM_STATIC) '$(BUILD_DIR)/.libs/libsmpeg.a' \
+        --ld '$(TARGET)-g++' \
+        `$(PREFIX)/$(TARGET)/bin/smpeg-config --libs | $(SED) -e 's/-L[^ ]*//g' -e 's/-lsmpeg//g'`)

    '$(TARGET)-gcc' \
        -W -Wall -Werror -std=c99 -pedantic \
        '$(TEST_FILE)' -o '$(PREFIX)/$(TARGET)/bin/test-smpeg.exe' \
        `'$(PREFIX)/$(TARGET)/bin/smpeg-config' --cflags --libs`
 endef
-
-$(PKG)_BUILD_SHARED =