From efadb7bca7fff8c0a87983f99d96cf0fd698bed2 Mon Sep 17 00:00:00 2001 From: Alejandro Mery Date: Wed, 1 Jun 2011 22:58:32 +0200 Subject: [PATCH] ncurses: fixed pkg-config support by been aware of $PKG_CONFIG_SYSROOT_DIR (should be upstreamed) --- base/ncurses/pkg_config_sysroot.patch | 40 +++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) create mode 100644 base/ncurses/pkg_config_sysroot.patch diff --git a/base/ncurses/pkg_config_sysroot.patch b/base/ncurses/pkg_config_sysroot.patch new file mode 100644 index 000000000..d580554ae --- /dev/null +++ b/base/ncurses/pkg_config_sysroot.patch @@ -0,0 +1,40 @@ +# --- SDE-COPYRIGHT-NOTE-BEGIN --- +# This copyright note is auto-generated by ./scripts/Create-CopyPatch. +# +# Filename: package/.../ncurses/pkg_config_sysroot.patch +# Copyright (C) 2011 The OpenSDE Project +# +# More information can be found in the files COPYING and README. +# +# This patch file is dual-licensed. It is available under the license the +# patched project is licensed under, as long as it is an OpenSource license +# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms +# of the GNU General Public License as published by the Free Software +# Foundation; either version 2 of the License, or (at your option) any later +# version. +# --- SDE-COPYRIGHT-NOTE-END --- + +--- ./configure.in.amery 2011-06-01 22:45:01.000000000 +0200 ++++ ./configure.in 2011-06-01 22:46:44.000000000 +0200 +@@ -178,6 +178,9 @@ + fi + PKG_CONFIG_LIBDIR=`echo "$PKG_CONFIG_LIBDIR" | sed -e 's/^://' -e 's/:.*//'` + if test -n "$PKG_CONFIG_LIBDIR" && test -d "$PKG_CONFIG_LIBDIR" ; then ++ if test -n "$PKG_CONFIG_SYSROOT_DIR" ; then ++ PKG_CONFIG_LIBDIR=`echo "$PKG_CONFIG_LIBDIR" | sed -e "s,^$PKG_CONFIG_SYSROOT_DIR,,"` ++ fi + AC_ARG_ENABLE(pc-files, + [ --enable-pc-files generate and install .pc files for pkg-config], + [enable_pc_files=$enableval], +--- ./configure.amery 2011-06-01 22:52:18.000000000 +0200 ++++ ./configure 2011-06-01 22:53:44.000000000 +0200 +@@ -3627,6 +3627,9 @@ + fi + PKG_CONFIG_LIBDIR=`echo "$PKG_CONFIG_LIBDIR" | sed -e 's/^://' -e 's/:.*//'` + if test -n "$PKG_CONFIG_LIBDIR" && test -d "$PKG_CONFIG_LIBDIR" ; then ++ if test -n "$PKG_CONFIG_SYSROOT_DIR" ; then ++ PKG_CONFIG_LIBDIR=`echo "$PKG_CONFIG_LIBDIR" | sed -e "s,^$PKG_CONFIG_SYSROOT_DIR,,"` ++ fi + + # Check whether --enable-pc-files or --disable-pc-files was given. + if test "${enable_pc_files+set}" = set; then