KumiSystems/openwrtv3
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

gettext-full: make autopoint and gettextize reloctable

Browse source 
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>

SVN-Revision: 48208
This commit is contained in:
Jo-Philipp Wich 2016-01-12 07:51:56 +00:00
parent f301086eca
commit b809725eb1
2 changed files with 31 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
package/libs/gettext-full/Makefile
View file

@ -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

30
package/libs/gettext-full/patches/000-relocatable.patch Normal file
View file

@ -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}