hak5/wifipineapple-openwrt
1
0
Fork 0
mirror of https://github.com/hak5/wifipineapple-openwrt.git synced 2025-10-29 16:57:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

CC: 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>

Backport of r48208

git-svn-id: svn://svn.openwrt.org/openwrt/branches/chaos_calmer@48211 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
Jo-Philipp Wich 2016-01-12 07:54:25 +00:00
parent 543b4372c8
commit 4bfa2e32d7
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}