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

Fix regress by letting the test know the correct shared lib versions.

Browse Source 
ok mbalmer
This commit is contained in:
deanna 2007-03-17 18:28:02 +00:00
parent f744994db1
commit 984d0b6e04
2 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
print/cups/Makefile
View File

@ -1,10 +1,10 @@
# $OpenBSD: Makefile,v 1.21 2006/11/17 19:15:36 mbalmer Exp $ # $OpenBSD: Makefile,v 1.22 2007/03/17 18:28:02 deanna Exp $
COMMENT= "Common Unix Printing System" COMMENT= "Common Unix Printing System"
VERSION= 1.2.7 VERSION= 1.2.7
DISTNAME= cups-${VERSION}-source DISTNAME= cups-${VERSION}-source
PKGNAME= ${DISTNAME:S/-source//} PKGNAME= ${DISTNAME:S/-source//}p0
CATEGORIES= print sysutils CATEGORIES= print sysutils
SHARED_LIBS= cups 3.0 \ SHARED_LIBS= cups 3.0 \
cupsimage 2.3 cupsimage 2.3

15
print/cups/patches/patch-test_run-stp-tests_sh
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-test_run-stp-tests_sh,v 1.2 2006/10/01 10:43:38 mbalmer Exp $ $OpenBSD: patch-test_run-stp-tests_sh,v 1.3 2007/03/17 18:28:02 deanna Exp $
--- test/run-stp-tests.sh.orig Wed Sep 20 11:35:02 2006 --- test/run-stp-tests.sh.orig Wed Nov 15 15:37:45 2006
+++ test/run-stp-tests.sh Wed Sep 20 11:36:00 2006 +++ test/run-stp-tests.sh Fri Mar 16 16:50:33 2007
@@ -30,7 +30,7 @@ argcount=$# @@ -30,7 +30,7 @@ argcount=$#
# Make the IPP test program... # Make the IPP test program...
# #
@ -10,3 +10,12 @@ $OpenBSD: patch-test_run-stp-tests_sh,v 1.2 2006/10/01 10:43:38 mbalmer Exp $
# #
# Figure out the proper echo options... # Figure out the proper echo options...
@@ -373,7 +373,7 @@ fi
export LD_LIBRARY_PATH
-LD_PRELOAD="$root/cups/libcups.so.2:$root/filter/libcupsimage.so.2"
+LD_PRELOAD="$root/cups/libcups.so.$LIBcups_VERSION:$root/filter/libcupsimage.so.$LIBcupsimage_VERSION"
export LD_PRELOAD
if test "x$DYLD_LIBRARY_PATH" = x; then