diff --git a/Platform/v2.0/Extensions/ExtensionMinGW.yaml b/Platform/v2.0/Extensions/ExtensionMinGW.yaml index 7b10c42..9ebc0b9 100644 --- a/Platform/v2.0/Extensions/ExtensionMinGW.yaml +++ b/Platform/v2.0/Extensions/ExtensionMinGW.yaml @@ -150,8 +150,6 @@ modules: - --enable-lib32 - --enable-wildcard - --prefix=/usr/wine_extensions/v2/MinGW/i686-w64-mingw32 - - CFLAGS=-O3 - - CPPFLAGS=-O3 builddir: true only-arches: - i386 @@ -166,8 +164,6 @@ modules: - --enable-lib64 - --enable-wildcard - --prefix=/usr/wine_extensions/v2/MinGW/x86_64-w64-mingw32 - - CFLAGS=-O3 - - CPPFLAGS=-O3 builddir: true only-arches: - x86_64 @@ -201,8 +197,6 @@ modules: - --enable-shared - --enable-static - --prefix=/usr/wine_extensions/v2/MinGW/i686-w64-mingw32 - - CFLAGS=-O3 - - CPPFLAGS=-O3 builddir: true only-arches: - i386 @@ -216,8 +210,6 @@ modules: - --enable-shared - --enable-static - --prefix=/usr/wine_extensions/v2/MinGW/x86_64-w64-mingw32 - - CFLAGS=-O3 - - CPPFLAGS=-O3 builddir: true only-arches: - x86_64 diff --git a/Platform/v2.0/Extensions/elf_compress.py b/Platform/v2.0/Extensions/elf_compress.py index 8b9e92b..a8c83d8 100644 --- a/Platform/v2.0/Extensions/elf_compress.py +++ b/Platform/v2.0/Extensions/elf_compress.py @@ -13,8 +13,8 @@ if __name__ == '__main__': print("Compress: " + path) subprocess.call(["cp", "-a", path, "tmp.so"]) subprocess.call(["strip", "--strip-debug", "tmp.so"]) + subprocess.call(["eu-elfcompress", "-vt", "gnu", "tmp.so"]) subprocess.call(["cp", "-a", "tmp.so", path]) - subprocess.call(["eu-elfcompress", "-vt", "gnu", path]) elif os.path.isdir(path): for i in map(lambda x: os.path.join(path, x), sorted(os.listdir(path))): diff --git a/Platform/v2.0/build.stable.sh b/Platform/v2.0/build.stable.sh index 2bf792d..641f440 100755 --- a/Platform/v2.0/build.stable.sh +++ b/Platform/v2.0/build.stable.sh @@ -2,7 +2,4 @@ # Args: [] CONF_PATH="$(dirname "$0")" && -"$CONF_PATH/../../tools/hash_modules.py" --require-build "$CONF_PATH/Sdk-x86_64.yaml" "x86_64" && -exec "$CONF_PATH/../../tools/build.sh" "$CONF_PATH/Sdk-x86_64.yaml" "x86_64" "$1" "$2" - -echo 'No build required.' \ No newline at end of file +exec "$CONF_PATH/../../tools/build_when_required.sh" "$CONF_PATH/Sdk-x86_64.yaml" "x86_64" "$1" "$2" \ No newline at end of file diff --git a/Platform/v2.0/platform/libfaudio.yaml b/Platform/v2.0/platform/libfaudio.yaml index a9edea4..5a40302 100644 --- a/Platform/v2.0/platform/libfaudio.yaml +++ b/Platform/v2.0/platform/libfaudio.yaml @@ -21,6 +21,8 @@ modules: - -DLIB_SUFFIX=32 builddir: true build-options: + cflags: -flto + cxxflags: -flto env: - CC=gcc -m32 - CXX=g++ -m32 @@ -42,6 +44,9 @@ modules: - -DPULSEAUDIO_SHARED=ON - -DVIDEO_WAYLAND=ON builddir: true + build-options: + cflags: -flto + cxxflags: -flto cleanup-platform: - "*.la" - "*.a" @@ -52,8 +57,11 @@ modules: type: archive url: https://github.com/FNA-XNA/FAudio/archive/20.01.tar.gz sha256: c015f7d395cf24b9050135238de38683e5a90378215bc6d5bb89777a9623f0e6 - builddir: true buildsystem: cmake-ninja + builddir: true + build-options: + cflags: -flto + cxxflags: -flto cleanup-platform: - "*.la" - "*.a" @@ -68,11 +76,11 @@ modules: - ln -s /usr/include /usr/lib/include buildsystem: cmake-ninja config-opts: - - -DCMAKE_C_FLAGS=-m32 - - -DCMAKE_CXX_FLAGS=-m32 - -DCMAKE_INSTALL_LIBDIR=lib32 builddir: true build-options: + cflags: -flto -m32 + cxxflags: -flto -m32 env: - PKG_CONFIG_PATH=/usr/lib32/pkgconfig post-install: diff --git a/Platform/v2.0/platform/libglu.yaml b/Platform/v2.0/platform/libglu.yaml index 19f0583..8c41145 100644 --- a/Platform/v2.0/platform/libglu.yaml +++ b/Platform/v2.0/platform/libglu.yaml @@ -24,10 +24,10 @@ modules: config-opts: - --build=i686-unknown-linux - --libdir=/usr/lib32 - - CFLAGS=-m32 - - CXXFLAGS=-m32 - - LDFLAGS=-m32 build-options: + cflags: -m32 + cxxflags: -m32 + ldflags: -m32 make-install-args: - DESTDIR=/usr/tmp_glu - install diff --git a/Platform/v2.0/platform/libldap.yaml b/Platform/v2.0/platform/libldap.yaml index 67c1cb7..54ba7a1 100644 --- a/Platform/v2.0/platform/libldap.yaml +++ b/Platform/v2.0/platform/libldap.yaml @@ -31,10 +31,10 @@ modules: - --libdir=/usr/lib32 - --disable-bdb - --disable-hdb - - CFLAGS=-m32 - - CXXFLAGS=-m32 - - LDFLAGS=-m32 build-options: + cflags: -m32 + cxxflags: -m32 + ldflags: -m32 make-install-args: - DESTDIR=/usr/tmp_ldap - install diff --git a/Platform/v2.0/platform/libpcap.yaml b/Platform/v2.0/platform/libpcap.yaml index 1577880..2454e81 100644 --- a/Platform/v2.0/platform/libpcap.yaml +++ b/Platform/v2.0/platform/libpcap.yaml @@ -7,6 +7,8 @@ modules: sha256: 635237637c5b619bcceba91900666b64d56ecb7be63f298f601ec786ce087094 builddir: true build-options: + cflags: -flto + cxxflags: -flto make-install-args: - DESTDIR=/usr/tmp_pcap - install @@ -24,10 +26,10 @@ modules: config-opts: - --build=i686-unknown-linux - --libdir=/usr/lib32 - - CFLAGS=-m32 - - CXXFLAGS=-m32 - - LDFLAGS=-m32 build-options: + cflags: -flto -m32 + cxxflags: -flto -m32 + ldflags: -m32 make-install-args: - DESTDIR=/usr/tmp_pcap - install diff --git a/Platform/v2.0/platform/libxslt-32bit.yaml b/Platform/v2.0/platform/libxslt-32bit.yaml index d8ea747..0d133ae 100644 --- a/Platform/v2.0/platform/libxslt-32bit.yaml +++ b/Platform/v2.0/platform/libxslt-32bit.yaml @@ -4,9 +4,9 @@ sources: - type: archive url: https://gitlab.gnome.org/GNOME/libxslt/-/archive/v1.1.34/libxslt-v1.1.34.tar.gz sha256: c61af4c898a93c2862f3f06bba8e5de5e352463febc94a2642d732f21e5d5641 -config-opts: - - CFLAGS=-m32 - - CPPFLAGS=-m32 builddir: true +build-options: + cflags: -flto -m32 + cxxflags: -flto -m32 only-arches: - x86_64 \ No newline at end of file diff --git a/Platform/v2.0/platform/platform.yaml b/Platform/v2.0/platform/platform.yaml index 4952928..bfc8995 100644 --- a/Platform/v2.0/platform/platform.yaml +++ b/Platform/v2.0/platform/platform.yaml @@ -10,5 +10,4 @@ modules: - libpcap.yaml - libfaudio.yaml - libldap.yaml - - python3-pygobject.yaml - libxslt-32bit.yaml diff --git a/Platform/v2.0/platform/python3-pygobject.yaml b/Platform/v2.0/platform/python3-pygobject.yaml deleted file mode 100644 index 041b2a8..0000000 --- a/Platform/v2.0/platform/python3-pygobject.yaml +++ /dev/null @@ -1,19 +0,0 @@ -name: python3-pygobject -sources: - - type: archive - url: https://ftp.acc.umu.se/pub/GNOME/sources/pygobject/3.34/pygobject-3.34.0.tar.xz - sha256: 87e2c9aa785f352ef111dcc5f63df9b85cf6e05e52ff04f803ffbebdacf5271a -buildsystem: simple -build-commands: - - python3 setup.py build - - python3 setup.py install - - python3 -c 'import gi.repository.Gtk' -modules: - - name: pycairo - sources: - - type: archive - url: https://files.pythonhosted.org/packages/3c/1a/c0478ecab31baae50fda9956547788afbd0ca563adc52c9b03cab30f17eb/pycairo-1.18.2.tar.gz - sha256: dcb853fd020729516e8828ad364084e752327d4cff8505d20b13504b32b16531 - buildsystem: simple - build-commands: - - pip3 install . \ No newline at end of file diff --git a/Platform/v2.0/vkd3d/release.yaml b/Platform/v2.0/vkd3d/release.yaml index 491c7b8..c8c34dc 100644 --- a/Platform/v2.0/vkd3d/release.yaml +++ b/Platform/v2.0/vkd3d/release.yaml @@ -41,10 +41,10 @@ modules: config-opts: - --build=i686-unknown-linux - --libdir=/usr/lib32 - - CFLAGS=-m32 - - CXXFLAGS=-m32 - - LDFLAGS=-m32 build-options: + cflags: -m32 + cxxflags: -m32 + ldflags: -m32 make-install-args: - DESTDIR=/usr/tmp_vkd3d - install diff --git a/tools b/tools index d05f998..35a8c97 160000 --- a/tools +++ b/tools @@ -1 +1 @@ -Subproject commit d05f998c394ffba0a152064fd22940f07cbcfbdf +Subproject commit 35a8c97317c61b141d53d9b9341f684bf4b462c3