diff options
| author | Jo-Philipp Wich <jow@openwrt.org> | 2016-01-12 07:54:25 +0000 |
|---|---|---|
| committer | Jo-Philipp Wich <jow@openwrt.org> | 2016-01-12 07:54:25 +0000 |
| commit | 4bfa2e32d7986f134fd0725fe6a2ed0876801b85 (patch) | |
| tree | de4e0ba09a2b1cf32aac46dc39f9d8908b340c21 | |
| parent | 543b4372c886c577ef42879b15ad3781ec4f7b71 (diff) | |
| download | upstream-4bfa2e32d7986f134fd0725fe6a2ed0876801b85.tar.gz upstream-4bfa2e32d7986f134fd0725fe6a2ed0876801b85.tar.bz2 upstream-4bfa2e32d7986f134fd0725fe6a2ed0876801b85.zip | |
CC: gettext-full: make autopoint and gettextize reloctable
The autopoint and gettextize host utilities contain hardcoded staging dir
paths which need to be overridden for the SDK environment.
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
Backport of r48208
git-svn-id: svn://svn.openwrt.org/openwrt/branches/chaos_calmer@48211 3c298f89-4303-0410-b956-a3cf2f4a3e73
| -rw-r--r-- | package/libs/gettext-full/Makefile | 2 | ||||
| -rw-r--r-- | package/libs/gettext-full/patches/000-relocatable.patch | 30 |
2 files changed, 31 insertions, 1 deletions
diff --git a/package/libs/gettext-full/Makefile b/package/libs/gettext-full/Makefile index 3e5e40459f..2e1cba4da4 100644 --- a/package/libs/gettext-full/Makefile +++ b/package/libs/gettext-full/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=gettext-full PKG_VERSION:=0.19.6 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE:=gettext-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=@GNU/gettext diff --git a/package/libs/gettext-full/patches/000-relocatable.patch b/package/libs/gettext-full/patches/000-relocatable.patch new file mode 100644 index 0000000000..c475579b39 --- /dev/null +++ b/package/libs/gettext-full/patches/000-relocatable.patch @@ -0,0 +1,30 @@ +--- a/gettext-tools/misc/autopoint.in ++++ b/gettext-tools/misc/autopoint.in +@@ -27,7 +27,11 @@ archive_version=@ARCHIVE_VERSION@ + + # Set variables + # - gettext_datadir directory where the data files are stored. +-prefix="@prefix@" ++if [ -n "$STAGING_DIR" ]; then ++ prefix="$STAGING_DIR/../host" ++else ++ prefix="@prefix@" ++fi + datarootdir="@datarootdir@" + : ${gettext_datadir="@datadir@/gettext"} + : ${AUTOM4TE=autom4te} +--- a/gettext-tools/misc/gettextize.in ++++ b/gettext-tools/misc/gettextize.in +@@ -27,7 +27,11 @@ archive_version=@ARCHIVE_VERSION@ + + # Set variables + # - gettext_datadir directory where the data files are stored. +-prefix="@prefix@" ++if [ -n "$STAGING_DIR" ]; then ++ prefix="$STAGING_DIR/../host" ++else ++ prefix="@prefix@" ++fi + datarootdir="@datarootdir@" + : ${gettext_datadir="@datadir@/gettext"} + : ${AUTOM4TE=autom4te} |