diff options
| author | Jo-Philipp Wich <jo@mein.io> | 2016-08-08 17:14:41 +0200 |
|---|---|---|
| committer | Jo-Philipp Wich <jo@mein.io> | 2016-08-15 13:34:17 +0200 |
| commit | d36c5152ef30b6182d1c661ffb538e9e974e1a03 (patch) | |
| tree | 9de5d54b7578b34e6d6ee0cf4cb6196546a7bebd /package/libs/ncurses/patches/500-cross.patch | |
| parent | 3a3424981c27e3c3ca35e076bcc0f399f86649c3 (diff) | |
| download | master-31e0f0ae-d36c5152ef30b6182d1c661ffb538e9e974e1a03.tar.gz master-31e0f0ae-d36c5152ef30b6182d1c661ffb538e9e974e1a03.tar.bz2 master-31e0f0ae-d36c5152ef30b6182d1c661ffb538e9e974e1a03.zip | |
ncurses: change handling of PKG_CONFIG_LIBDIR
When PKG_CONFIG_LIBDIR was unset in the environment, the configure
script was deducing the PKG_CONFIG_LIBDIR from the location of the
pkg-config binary, which doesn't make a lot of sense, and isn't done
by other autotools based packages.
Patch imported from the Buildroot project:
https://github.com/buildroot/buildroot/blob/master/package/ncurses/0001-fixup-pkg-config-handling.patch
Also refresh patches while we're at.
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
Diffstat (limited to 'package/libs/ncurses/patches/500-cross.patch')
| -rw-r--r-- | package/libs/ncurses/patches/500-cross.patch | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/package/libs/ncurses/patches/500-cross.patch b/package/libs/ncurses/patches/500-cross.patch index ace6252fe6..976a3cba2a 100644 --- a/package/libs/ncurses/patches/500-cross.patch +++ b/package/libs/ncurses/patches/500-cross.patch @@ -1,11 +1,11 @@ --- a/aclocal.m4 +++ b/aclocal.m4 -@@ -4298,7 +4298,7 @@ CF_EOF - EXTRA_LDFLAGS="-Wl,-rpath,\${libdir} $EXTRA_LDFLAGS" +@@ -5137,7 +5137,7 @@ CF_EOF + EXTRA_LDFLAGS="${cf_ld_rpath_opt}\${libdir} $EXTRA_LDFLAGS" fi CF_SHARED_SONAME - MK_SHARED_LIB='${CC} ${CFLAGS} -shared -Wl,-soname,'$cf_cv_shared_soname',-stats,-lc -o $[@]' + MK_SHARED_LIB='${CC} ${CFLAGS} -shared -Wl,-soname,'$cf_shared_soname',-stats,$(LDFLAGS) -lc -o $[@]' ;; - openbsd[[2-9]].*) + openbsd[[2-9]].*) #(vi if test "$DFT_LWR_MODEL" = "shared" ; then |