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

use -pthread instead of -lpthread for pthreads linkage in CUPS

Browse Source 
bulk build tested by steven@ (a while ago) "sure" mbalmer@
This commit is contained in:
jakemsr 2007-12-11 08:00:06 +00:00
parent 41cd1c99bd
commit b8d7bcd5a4
8 changed files with 66 additions and 19 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.30 2007/09/30 14:39:23 steven Exp $
# $OpenBSD: Makefile,v 1.31 2007/12/11 08:00:06 jakemsr Exp $
COMMENT= Common Unix Printing System
VERSION= 1.2.7
DISTNAME= cups-${VERSION}-source
PKGNAME= cups-${VERSION}p8
PKGNAME= cups-${VERSION}p9
CATEGORIES= print sysutils
SHARED_LIBS= cups 3.0 \
cupsimage 2.3

15
print/cups/patches/patch-configure
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-configure,v 1.4 2007/05/07 13:58:07 ajacoutot Exp $
--- configure.orig Thu Nov 16 15:51:56 2006
+++ configure Mon May 7 15:49:38 2007
$OpenBSD: patch-configure,v 1.5 2007/12/11 08:00:06 jakemsr Exp $
--- configure.orig Thu Nov 16 06:51:56 2006
+++ configure Sun Oct 21 00:41:30 2007
@@ -7910,8 +7910,8 @@ if test x$enable_shared != xno; then
DSOFLAGS="$DSOFLAGS -set_version,sgi2.6,-soname,\`basename \$@\` -shared \$(OPTIM)"
;;
@ -21,3 +21,12 @@ $OpenBSD: patch-configure,v 1.4 2007/05/07 13:58:07 ajacoutot Exp $
else
OPTIM="$with_optim $OPTIM"
fi
@@ -12405,7 +12405,7 @@ fi
if test x$ac_cv_header_pthread_h = xyes; then
- for flag in -lpthreads -lpthread -pthread; do
+ for flag in -pthread -lpthreads -lpthread ; do
echo "$as_me:$LINENO: checking for pthread_create using $flag" >&5
echo $ECHO_N "checking for pthread_create using $flag... $ECHO_C" >&6
SAVELIBS="$LIBS"

8
print/xpp/Makefile
View File

@ -1,8 +1,9 @@
# $OpenBSD: Makefile,v 1.3 2007/09/02 17:42:36 jasper Exp $
# $OpenBSD: Makefile,v 1.4 2007/12/11 08:00:06 jakemsr Exp $
COMMENT= X Printing Panel
DISTNAME= xpp-1.5
PKGNAME= ${DISTNAME}p0
CATEGORIES= print sysutils
HOMEPAGE= http://cups.sourceforge.net/xpp/
@ -15,7 +16,8 @@ PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
WANTLIB= ICE stdc++ Xext GL X11 SM c m z
WANTLIB= GL ICE SM X11 Xau Xdmcp Xext c crypto m \
pthread stdc++ ssl z
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=cups/}
@ -27,5 +29,7 @@ LIB_DEPENDS= cups::print/cups \
CONFIGURE_STYLE= gnu
USE_GMAKE= Yes
USE_X11= Yes
CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
.include <bsd.port.mk>

21
print/xpp/patches/patch-configure Normal file
View File

@ -0,0 +1,21 @@
$OpenBSD: patch-configure,v 1.1 2007/12/11 08:00:06 jakemsr Exp $
--- configure.orig Wed Oct 31 04:36:29 2007
+++ configure Wed Oct 31 04:37:47 2007
@@ -2708,7 +2708,7 @@ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set
echo $ac_n "(cached) $ac_c" 1>&6
else
ac_save_LIBS="$LIBS"
-LIBS="-lcups $LIBS"
+LIBS="`cups-config --libs` $LIBS"
cat > conftest.$ac_ext <<EOF
#line 2714 "configure"
#include "confdefs.h"
@@ -2742,7 +2742,7 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = ye
#define $ac_tr_lib 1
EOF
- LIBS="-lcups $LIBS"
+ LIBS="`cups-config --libs` $LIBS"
else
echo "$ac_t""no" 1>&6

10
print/xpp/patches/patch-mainwindow_fl
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-mainwindow_fl,v 1.1.1.1 2006/10/22 12:02:11 mbalmer Exp $
--- mainwindow.fl.orig Mon Aug 22 13:07:48 2005
+++ mainwindow.fl Mon Aug 22 13:08:38 2005
@@ -22,30 +22,18 @@ print=new printFiles(argc,argv,exitstat)
$OpenBSD: patch-mainwindow_fl,v 1.2 2007/12/11 08:00:06 jakemsr Exp $
--- mainwindow.fl.orig Mon Dec 6 19:24:46 2004
+++ mainwindow.fl Wed Oct 31 04:33:00 2007
@@ -22,30 +22,18 @@ print=new printFiles(argc,argv,exitstat);
if (exitstat != 0) return;} {}
Fl_Window mainWindow {
label {X Printing Panel}
@ -100,7 +100,7 @@ $OpenBSD: patch-mainwindow_fl,v 1.1.1.1 2006/10/22 12:02:11 mbalmer Exp $
code0 {\#include "xpp.h"}
}
}
@@ -166,7 +154,7 @@ for (i = 0; i < print->dests[print->dest
@@ -166,7 +154,7 @@ for (i = 0; i < print->dests[print->dest_pos].num_opti
&(print->changed_options));} {}
Fl_Window optionDialog {
label {Printing Options} open

10
print/xpp/patches/patch-xpp_cxx
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-xpp_cxx,v 1.1.1.1 2006/10/22 12:02:11 mbalmer Exp $
--- xpp.cxx.orig Mon Dec 6 20:00:04 2004
+++ xpp.cxx Mon Aug 22 10:19:54 2005
@@ -85,6 +85,10 @@ printFiles::printFiles(int argc, /* I -
$OpenBSD: patch-xpp_cxx,v 1.2 2007/12/11 08:00:06 jakemsr Exp $
--- xpp.cxx.orig Mon Dec 6 11:00:04 2004
+++ xpp.cxx Wed Oct 31 04:33:00 2007
@@ -85,6 +85,10 @@ printFiles::printFiles(int argc, /* I - Number of com
num_copies = 1;
priority = 50;
@ -12,7 +12,7 @@ $OpenBSD: patch-xpp_cxx,v 1.1.1.1 2006/10/22 12:02:11 mbalmer Exp $
// Set CUPS server, port, and user
CupsHelper::setup();
@@ -250,7 +254,8 @@ printFiles::printFiles(int argc, /* I -
@@ -250,7 +254,8 @@ printFiles::printFiles(int argc, /* I - Number of com
// Remove trailing space in the end of the file list

8
x11/qt4/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.44 2007/10/25 09:30:22 wilfried Exp $
# $OpenBSD: Makefile,v 1.45 2007/12/11 08:00:06 jakemsr Exp $
COMMENT-main= C++ X11 GUI toolkit
COMMENT-examples= examples for qt4
@ -14,7 +14,7 @@ PKGNAME-postgresql= qt4-postgresql-${VERSION}
PKGNAME-examples= qt4-examples-${VERSION}p0
PKGNAME-sqlite2= qt4-sqlite2-${VERSION}
PKGNAME-sqlite= qt4-sqlite-${VERSION}
PKGNAME-main= qt4-${VERSION}p0
PKGNAME-main= qt4-${VERSION}p1
FULLPKGNAME-html= qt4-html-${VERSION}p0
SHARED_LIBS= Qt3Support 8.0 \
QtCore 7.0 \
@ -203,6 +203,10 @@ MAKE_FLAGS+=LIB$l_VERSION=$v
FAKE_FLAGS=$(MAKE_FLAGS) INSTALL_ROOT=${WRKINST}
post-patch:
perl -pi -e "s#!!CUPS_LIBS!!#`cups-config --libs`#" \
${WRKSRC}/config.tests/unix/cups/cups.pro
post-install:
# extra doc
cd ${WRKSRC}; ${INSTALL_DATA} ${DOCS} ${QT_DOC}

9
x11/qt4/patches/patch-config_tests_unix_cups_cups_pro Normal file
View File

@ -0,0 +1,9 @@
$OpenBSD: patch-config_tests_unix_cups_cups_pro,v 1.1 2007/12/11 08:00:06 jakemsr Exp $
--- config.tests/unix/cups/cups.pro.orig Mon Oct 29 16:59:11 2007
+++ config.tests/unix/cups/cups.pro Mon Oct 29 17:06:55 2007
@@ -1,4 +1,4 @@
SOURCES = cups.cpp
CONFIG -= qt dylib
mac:CONFIG -= app_bundle
-LIBS += -lcups
+LIBS += !!CUPS_LIBS!!