From cb33d518c6230cc50ab5565b5fd7bfb28412f0c7 Mon Sep 17 00:00:00 2001 From: Matthias Schiffer Date: Thu, 19 Jan 2017 00:09:16 +0100 Subject: [PATCH] build: backport a few STAGING_DIR_HOSTPKG bugfixes --- ...-rules.mk-export-STAGING_DIR_HOSTPKG.patch | 19 +++++++++++ ..._HOSTPKG-instead-of-STAGING_DIR-host.patch | 32 +++++++++++++++++++ 2 files changed, 51 insertions(+) create mode 100644 patches/lede/0007-rules.mk-export-STAGING_DIR_HOSTPKG.patch create mode 100644 patches/lede/0008-gettext-full-fix-to-use-STAGING_DIR_HOSTPKG-instead-of-STAGING_DIR-host.patch diff --git a/patches/lede/0007-rules.mk-export-STAGING_DIR_HOSTPKG.patch b/patches/lede/0007-rules.mk-export-STAGING_DIR_HOSTPKG.patch new file mode 100644 index 00000000..6656c47f --- /dev/null +++ b/patches/lede/0007-rules.mk-export-STAGING_DIR_HOSTPKG.patch @@ -0,0 +1,19 @@ +From: Matthias Schiffer +Date: Thu, 19 Jan 2017 00:03:32 +0100 +Subject: rules.mk: export STAGING_DIR_HOSTPKG + +Signed-off-by: Matthias Schiffer + +diff --git a/rules.mk b/rules.mk +index 95b18f9e5c69de479db54c5bdb740103140dcf74..1b9de5f35e3890c2759ab2cdbd98ac80df942124 100644 +--- a/rules.mk ++++ b/rules.mk +@@ -223,7 +223,7 @@ else + endif + + export PATH:=$(TARGET_PATH) +-export STAGING_DIR STAGING_DIR_HOST ++export STAGING_DIR STAGING_DIR_HOST STAGING_DIR_HOSTPKG + export SH_FUNC:=. $(INCLUDE_DIR)/shell.sh; + + PKG_CONFIG:=$(STAGING_DIR_HOST)/bin/pkg-config diff --git a/patches/lede/0008-gettext-full-fix-to-use-STAGING_DIR_HOSTPKG-instead-of-STAGING_DIR-host.patch b/patches/lede/0008-gettext-full-fix-to-use-STAGING_DIR_HOSTPKG-instead-of-STAGING_DIR-host.patch new file mode 100644 index 00000000..4aa04521 --- /dev/null +++ b/patches/lede/0008-gettext-full-fix-to-use-STAGING_DIR_HOSTPKG-instead-of-STAGING_DIR-host.patch @@ -0,0 +1,32 @@ +From: Matthias Schiffer +Date: Thu, 19 Jan 2017 00:04:09 +0100 +Subject: gettext-full: fix to use $STAGING_DIR_HOSTPKG instead of $STAGING_DIR/host + +Signed-off-by: Matthias Schiffer + +diff --git a/package/libs/gettext-full/patches/000-relocatable.patch b/package/libs/gettext-full/patches/000-relocatable.patch +index c14be728367b57c08024d848cf8ff847cfe865be..a95c268f5bc94ed8ec3784ae2044aa77e0322491 100644 +--- a/package/libs/gettext-full/patches/000-relocatable.patch ++++ b/package/libs/gettext-full/patches/000-relocatable.patch +@@ -5,8 +5,8 @@ + # Set variables + # - gettext_datadir directory where the data files are stored. + -prefix="@prefix@" +-+if [ -n "$STAGING_DIR" ]; then +-+ prefix="$STAGING_DIR/host" +++if [ -n "$STAGING_DIR_HOSTPKG" ]; then +++ prefix="$STAGING_DIR_HOSTPKG" + +else + + prefix="@prefix@" + +fi +@@ -20,8 +20,8 @@ + # Set variables + # - gettext_datadir directory where the data files are stored. + -prefix="@prefix@" +-+if [ -n "$STAGING_DIR" ]; then +-+ prefix="$STAGING_DIR/host" +++if [ -n "$STAGING_DIR_HOSTPKG" ]; then +++ prefix="$STAGING_DIR_HOSTPKG" + +else + + prefix="@prefix@" + +fi