Author: jow Date: 2016-01-12 08:51:56 +0100 (Tue, 12 Jan 2016) New Revision: 48208
Added: trunk/package/libs/gettext-full/patches/000-relocatable.patch Modified: trunk/package/libs/gettext-full/Makefile Log: 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 <[email protected]> Modified: trunk/package/libs/gettext-full/Makefile =================================================================== --- trunk/package/libs/gettext-full/Makefile 2016-01-11 23:11:13 UTC (rev 48207) +++ trunk/package/libs/gettext-full/Makefile 2016-01-12 07:51:56 UTC (rev 48208) @@ -9,7 +9,7 @@ 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 Added: trunk/package/libs/gettext-full/patches/000-relocatable.patch =================================================================== --- trunk/package/libs/gettext-full/patches/000-relocatable.patch (rev 0) +++ trunk/package/libs/gettext-full/patches/000-relocatable.patch 2016-01-12 07:51:56 UTC (rev 48208) @@ -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} _______________________________________________ openwrt-commits mailing list [email protected] https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-commits
