cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

prevent -R/usr/X11R6/lib/ from ending up in the pkgconfig files, this breaks

Browse Source 
g-ir-scanner. also, since our ld already searches in /usr/X11R6/lib/ there's
no need to explicitly list it here again.

discussed with and ok aja@
This commit is contained in:
jasper 2011-05-13 23:52:55 +00:00
parent 6763a508bd
commit f5f01d8691
2 changed files with 30 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
devel/pango/Makefile
View File

@ -1,11 +1,11 @@
# $OpenBSD: Makefile,v 1.53 2011/04/07 06:51:04 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.54 2011/05/13 23:52:55 jasper Exp $
COMMENT= library for layout and rendering of text
V= 1.28.4
DISTNAME= pango-${V}
REVISION= 0
REVISION= 1
SHARED_LIBS += pango-1.0 1802.0 # .2800.0
SHARED_LIBS += pangox-1.0 1802.0 # .2800.0

28
devel/pango/patches/patch-configure Normal file
View File

@ -0,0 +1,28 @@
$OpenBSD: patch-configure,v 1.19 2011/05/13 23:52:55 jasper Exp $
Don't add -R/usr/X11R6/lib, as our ld(1) already searches there by default and
it breaks g-ir-scanner (doesn't recognize -R when coming in via pkg-config).
--- configure.orig Fri May 13 12:43:51 2011
+++ configure Fri May 13 12:45:29 2011
@@ -17546,9 +17546,9 @@ _ACEOF
if ac_fn_c_try_link "$LINENO"; then :
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
- X_LIBS="$X_LIBS -R$x_libraries"
+ X_LIBS="$X_LIBS"
else
- LIBS="$ac_xsave_LIBS -R $x_libraries"
+ LIBS="$ac_xsave_LIBS"
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
@@ -17563,7 +17563,7 @@ _ACEOF
if ac_fn_c_try_link "$LINENO"; then :
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
- X_LIBS="$X_LIBS -R $x_libraries"
+ X_LIBS="$X_LIBS"
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: neither works" >&5
$as_echo "neither works" >&6; }