Remove -lpthread patching.

This commit is contained in:
ajacoutot 2013-08-09 17:44:50 +00:00
parent 24fd2f524b
commit 3a3d17cac1
2 changed files with 8 additions and 21 deletions

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.83 2013/08/06 19:13:37 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.84 2013/08/09 17:44:50 ajacoutot Exp $
SHARED_ONLY= Yes
@ -17,6 +17,12 @@ PKGNAME-hpcups= hpcups-${V}
PKGNAME-libs= hplip-libs-${V}
PKGNAME-gui= hplip-gui-${V}
REVISION-main= 0
REVISION-hpijs= 0
REVISION-hpcups=0
REVISION-libs= 0
REVISION-gui= 0
SHARED_LIBS += hpmud 2.0 # .0.6
SHARED_LIBS += hpip 2.0 # .0.1

View File

@ -1,4 +1,4 @@
$OpenBSD: patch-configure,v 1.11 2012/06/26 06:17:11 ajacoutot Exp $
$OpenBSD: patch-configure,v 1.12 2013/08/09 17:44:50 ajacoutot Exp $
--- configure.orig Mon Jun 18 12:44:47 2012
+++ configure Tue Jun 26 07:36:13 2012
@@ -11406,6 +11406,11 @@ else
@ -13,25 +13,6 @@ $OpenBSD: patch-configure,v 1.11 2012/06/26 06:17:11 ajacoutot Exp $
darwin*)
# if libdl is installed we need to link against it
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
@@ -15218,14 +15223,14 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
-# Checks for required libraries, don't set global -lpthread, -lm, -ljpeg, ... here, set in Makefile.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_create in -lpthread" >&5
-$as_echo_n "checking for pthread_create in -lpthread... " >&6; }
+# Checks for required libraries, don't set global -pthread, -lm, -ljpeg, ... here, set in Makefile.
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_create in -pthread" >&5
+$as_echo_n "checking for pthread_create in -pthread... " >&6; }
if ${ac_cv_lib_pthread_pthread_create+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
-LIBS="-lpthread $LIBS"
+LIBS="-pthread $LIBS"
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
@@ -15344,50 +15349,6 @@ if test "x$ac_cv_lib_jpeg_jpeg_set_defaults" = xyes; t
else
as_fn_error 102 "\"cannot find libjpeg support\"" "$LINENO" 5