From 7ac25af96a0f29ef724a7deb3bf82e81d1f309d4 Mon Sep 17 00:00:00 2001 From: Lucio Andrés Illanes Albornoz Date: Sep 01 2019 12:37:53 +0000 Subject: vars/build.vars:{gmp{,_host},binutils{,_host}{,_mingw32},libelf,libffi_host}:${PKG_PATCHES_EXTRA}: adapt to chainport's new directory layout. vars/binutils{,_host}{,_mingw32}.vars: adapt to chainport's new directory layout. --- diff --git a/vars/binutils.vars b/vars/binutils.vars new file mode 100644 index 0000000..d5669ff --- /dev/null +++ b/vars/binutils.vars @@ -0,0 +1,24 @@ +# +# set -o errexit -o noglob are assumed. +# + +pkg_binutils_configure_patch_post() { + local _overlay_dname="${BUILD_WORKDIR}/chainport/overlay/m${PKG_NAME%%_*}"; + if [ -d "${_overlay_dname}" ]; then + tar -C "${_overlay_dname}" -cpf - . | tar -C "${PKG_BASE_DIR}/${PKG_SUBDIR}" -xpf -; + fi; +}; + +pkg_binutils_host_configure_patch_post() { + pkg_binutils_configure_patch_post "${@}"; +}; + +pkg_binutils_host_mingw32_configure_patch_post() { + pkg_binutils_configure_patch_post "${@}"; +}; + +pkg_binutils_mingw32_configure_patch_post() { + pkg_binutils_configure_patch_post "${@}"; +}; + +# vim:filetype=sh diff --git a/vars/binutils_host.vars b/vars/binutils_host.vars new file mode 120000 index 0000000..2c4e1f2 --- /dev/null +++ b/vars/binutils_host.vars @@ -0,0 +1 @@ +binutils.vars \ No newline at end of file diff --git a/vars/binutils_host_mingw32.vars b/vars/binutils_host_mingw32.vars new file mode 120000 index 0000000..2c4e1f2 --- /dev/null +++ b/vars/binutils_host_mingw32.vars @@ -0,0 +1 @@ +binutils.vars \ No newline at end of file diff --git a/vars/binutils_mingw32.vars b/vars/binutils_mingw32.vars new file mode 120000 index 0000000..2c4e1f2 --- /dev/null +++ b/vars/binutils_mingw32.vars @@ -0,0 +1 @@ +binutils.vars \ No newline at end of file diff --git a/vars/build.vars b/vars/build.vars index 3ab39bf..b2bd013 100644 --- a/vars/build.vars +++ b/vars/build.vars @@ -231,7 +231,7 @@ HOST_TOOLCHAIN_DEPS_PREFIX="${PREFIX_CROSS}"; : ${PKG_GMP_HOST_VERSION:=6.1.2}; : ${PKG_GMP_HOST_URL:=https://gmplib.org/download/gmp/gmp-${PKG_GMP_HOST_VERSION}.tar.bz2}; : ${PKG_GMP_HOST_CONFIGURE_ARGS_EXTRA:=--disable-assembly}; -: ${PKG_GMP_HOST_PATCHES_EXTRA:="${BUILD_WORKDIR}/chainport/gmp-${PKG_GMP_HOST_VERSION}.midipix.patch"}; +: ${PKG_GMP_HOST_PATCHES_EXTRA:="${BUILD_WORKDIR}/chainport/patches/gmp-${PKG_GMP_HOST_VERSION}.midipix.patch"}; : ${PKG_MPFR_HOST_SHA256SUM:=79c73f60af010a30a5c27a955a1d2d01ba095b72537dab0ecaad57f5a7bb1b6b}; : ${PKG_MPFR_HOST_VERSION:=3.1.2}; : ${PKG_MPFR_HOST_URL:=ftp://ftp.gnu.org/gnu/mpfr/mpfr-${PKG_MPFR_HOST_VERSION}.tar.bz2}; @@ -260,7 +260,7 @@ HOST_TOOLCHAIN_PREFIX="${PREFIX_CROSS}"; : ${PKG_BINUTILS_HOST_INSTALL_FILES:="@${DEFAULT_TARGET}-windmc=bin/windmc @${DEFAULT_TARGET}-windres=bin/windres"}; : ${PKG_BINUTILS_HOST_MAKEFLAGS_INSTALL_EXTRA:="PREFIX= prefix="}; : ${PKG_BINUTILS_HOST_LIBTOOL:=slibtool-static}; -: ${PKG_BINUTILS_HOST_PATCHES_EXTRA:="${BUILD_WORKDIR}/chainport/binutils-${PKG_BINUTILS_HOST_VERSION}.midipix.patch"}; +: ${PKG_BINUTILS_HOST_PATCHES_EXTRA:="${BUILD_WORKDIR}/chainport/patches/binutils-${PKG_BINUTILS_HOST_VERSION}.midipix.patch"}; : ${PKG_BINUTILS_HOST_PREFIX:=${PREFIX}}; : ${PKG_BINUTILS_HOST_CFLAGS_CONFIGURE:="-I${PREFIX}/include -g2 -O0"}; : ${PKG_BINUTILS_HOST_LDFLAGS_CONFIGURE:="-L${PREFIX}/lib -Wl,-rpath,${PREFIX}/lib"}; @@ -338,7 +338,7 @@ HOST_TOOLCHAIN_MINGW32_TARGET="x86_64-w64-mingw32"; : ${PKG_BINUTILS_HOST_MINGW32_CONFIGURE_ARGS_EXTRA:="--disable-werror --enable-deterministic-archives --with-sysroot=${PREFIX_MINGW32}"}; : ${PKG_BINUTILS_HOST_MINGW32_MAKEFLAGS_INSTALL:="PREFIX= prefix="}; : ${PKG_BINUTILS_HOST_MINGW32_LIBTOOL:=slibtool-static}; -: ${PKG_BINUTILS_HOST_MINGW32_PATCHES_EXTRA:="${BUILD_WORKDIR}/chainport/binutils-${PKG_BINUTILS_HOST_MINGW32_VERSION}.midipix.patch"}; +: ${PKG_BINUTILS_HOST_MINGW32_PATCHES_EXTRA:="${BUILD_WORKDIR}/chainport/patches/binutils-${PKG_BINUTILS_HOST_MINGW32_VERSION}.midipix.patch"}; : ${PKG_BINUTILS_HOST_MINGW32_PREFIX:=${PREFIX}}; : ${PKG_GCC_STAGE1_CROSS_MINGW32_VERSION:=4.6.4}; : ${PKG_GCC_STAGE1_CROSS_MINGW32_BASE_DIR:=${BUILD_WORKDIR}/gcc-host-x86_64-w64-mingw32}; @@ -378,12 +378,12 @@ NATIVE_TOOLCHAIN_DEPS_PREFIX="${PREFIX_NATIVE}"; : ${PKG_GMP_VERSION:=6.1.2}; : ${PKG_GMP_URL:=https://gmplib.org/download/gmp/gmp-${PKG_GMP_VERSION}.tar.bz2}; : ${PKG_GMP_CONFIGURE_ARGS_EXTRA:=--disable-assembly}; -: ${PKG_GMP_PATCHES_EXTRA:="${BUILD_WORKDIR}/chainport/gmp-${PKG_GMP_VERSION}.midipix.patch"}; +: ${PKG_GMP_PATCHES_EXTRA:="${BUILD_WORKDIR}/chainport/patches/gmp-${PKG_GMP_VERSION}.midipix.patch"}; : ${PKG_LIBELF_SHA256SUM:=591a9b4ec81c1f2042a97aa60564e0cb79d041c52faa7416acb38bc95bd2c76d}; : ${PKG_LIBELF_VERSION:=0.8.13}; : ${PKG_LIBELF_URL:=https://fossies.org/linux/misc/old/libelf-${PKG_LIBELF_VERSION}.tar.gz}; : ${PKG_LIBELF_MAKE_INSTALL_VNAME:=prefix}; -: ${PKG_LIBELF_PATCHES_EXTRA:="${BUILD_WORKDIR}/chainport/libelf-${PKG_LIBELF_VERSION}.midipix.patch"}; +: ${PKG_LIBELF_PATCHES_EXTRA:="${BUILD_WORKDIR}/chainport/patches/libelf-${PKG_LIBELF_VERSION}.midipix.patch"}; : ${PKG_MPFR_SHA256SUM:=79c73f60af010a30a5c27a955a1d2d01ba095b72537dab0ecaad57f5a7bb1b6b}; : ${PKG_MPFR_VERSION:=3.1.2}; : ${PKG_MPFR_URL:=ftp://ftp.gnu.org/gnu/mpfr/mpfr-${PKG_MPFR_VERSION}.tar.bz2}; @@ -406,7 +406,7 @@ NATIVE_TOOLCHAIN_PREFIX="${PREFIX_NATIVE}"; : ${PKG_BINUTILS_CONFIGURE_ARGS_EXTRA:="--enable-deterministic-archives --with-libelf=${PREFIX_NATIVE} --with-gmp=${PREFIX_NATIVE} --with-mpc=${PREFIX_NATIVE} --with-mpfr=${PREFIX_NATIVE} --with-sysroot=/"}; : ${PKG_BINUTILS_CFLAGS_CONFIGURE:="-isystem ${PREFIX_NATIVE}/include -Wno-error=cpp"}; : ${PKG_BINUTILS_LDFLAGS_CONFIGURE:="-L${PREFIX_NATIVE}/lib"}; -: ${PKG_BINUTILS_PATCHES_EXTRA:="${BUILD_WORKDIR}/chainport/binutils-${PKG_BINUTILS_VERSION}.midipix.patch"}; +: ${PKG_BINUTILS_PATCHES_EXTRA:="${BUILD_WORKDIR}/chainport/patches/binutils-${PKG_BINUTILS_VERSION}.midipix.patch"}; : ${PKG_BINUTILS_LIBTOOL:=slibtool-static}; : ${PKG_MUSL_FULL_SHA256SUM:=8a0feb41cef26c97dde382c014e68b9bb335c094bbc1356f6edaaf6b79bd14aa}; @@ -434,7 +434,7 @@ NATIVE_TOOLCHAIN_MINGW32_PREFIX="${PREFIX_NATIVE}"; : ${PKG_BINUTILS_MINGW32_VERSION:=2.24.51}; : ${PKG_BINUTILS_MINGW32_URL:=ftp://sourceware.org/pub/binutils/snapshots/binutils-${PKG_BINUTILS_MINGW32_VERSION}.tar.bz2}; : ${PKG_BINUTILS_MINGW32_CONFIGURE_ARGS_EXTRA:="--enable-deterministic-archives --with-libelf=${PREFIX_NATIVE} --with-gmp=${PREFIX_NATIVE} --with-mpc=${PREFIX_NATIVE} --with-mpfr=${PREFIX_NATIVE} --with-sysroot=/"}; -: ${PKG_BINUTILS_MINGW32_PATCHES_EXTRA:="${BUILD_WORKDIR}/chainport/binutils-${PKG_BINUTILS_MINGW32_VERSION}.midipix.patch"}; +: ${PKG_BINUTILS_MINGW32_PATCHES_EXTRA:="${BUILD_WORKDIR}/chainport/patches/binutils-${PKG_BINUTILS_MINGW32_VERSION}.midipix.patch"}; : ${PKG_BINUTILS_MINGW32_LIBTOOL:=slibtool-static}; : ${PKG_GCC_STAGE1_NATIVE_MINGW32_VERSION:=4.6.4}; : ${PKG_GCC_STAGE1_NATIVE_MINGW32_BASE_DIR:=${BUILD_WORKDIR}/gcc-native-x86_64-w64-mingw32}; @@ -530,7 +530,7 @@ HOST_PACKAGES_DEPS_PREFIX="${PREFIX}"; : ${PKG_LIBFFI_HOST_SHA256SUM:=d06ebb8e1d9a22d19e38d63fdb83954253f39bedc5d46232a05645685722ca37}; : ${PKG_LIBFFI_HOST_VERSION:=3.2.1}; : ${PKG_LIBFFI_HOST_URL:=ftp://sourceware.org/pub/libffi/libffi-${PKG_LIBFFI_HOST_VERSION}.tar.gz}; -: ${PKG_LIBFFI_HOST_PATCHES_EXTRA:="${BUILD_WORKDIR}/chainport/libffi-${PKG_LIBFFI_HOST_VERSION}.midipix.patch"}; +: ${PKG_LIBFFI_HOST_PATCHES_EXTRA:="${BUILD_WORKDIR}/chainport/patches/libffi-${PKG_LIBFFI_HOST_VERSION}.midipix.patch"}; : ${PKG_EXPAT_HOST_SHA256SUM:=17b43c2716d521369f82fc2dc70f359860e90fa440bea65b3b85f0b246ea81f2}; : ${PKG_EXPAT_HOST_VERSION:=2.2.6}; : ${PKG_EXPAT_HOST_URL:=http://download.openpkg.org/components/cache/expat/expat-${PKG_EXPAT_HOST_VERSION}.tar.bz2}; @@ -721,7 +721,7 @@ NATIVE_PACKAGES_DEPS_PYTHON="${PREFIX}/bin/python2"; : ${PKG_LIBFFI_ENV_VARS_EXTRA:="MAKE=make LIBTOOL=slibtool"}; : ${PKG_LIBFFI_CFLAGS_CONFIGURE_EXTRA:=-D_WIN64}; : ${PKG_LIBFFI_INSTALL_FILES:="lib/libffi-${PKG_LIBFFI_VERSION}/include/ffi.h=include/ffi.h lib/libffi-${PKG_LIBFFI_VERSION}/include/ffitarget.h=include/ffitarget.h"}; -: ${PKG_LIBFFI_PATCHES_EXTRA:="${BUILD_WORKDIR}/chainport/libffi-${PKG_LIBFFI_VERSION}.midipix.patch"}; +: ${PKG_LIBFFI_PATCHES_EXTRA:="${BUILD_WORKDIR}/chainport/patches/libffi-${PKG_LIBFFI_VERSION}.midipix.patch"}; : ${PKG_GDBM_SHA256SUM:=86e613527e5dba544e73208f42b78b7c022d4fa5a6d5498bf18c8d6f745b91dc}; : ${PKG_GDBM_VERSION:=1.18.1}; : ${PKG_GDBM_URL:=ftp://ftp.gnu.org/gnu/gdbm/gdbm-${PKG_GDBM_VERSION}.tar.gz};