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

Fix after proj update: add -pthread to LDFLAGS and WANTLIB-{main,utils}.

Browse Source 
Bump corresponding REVISIONs.
This commit is contained in:
landry 2010-11-21 09:32:57 +00:00
parent bad72fbc0a
commit 1a9c2bc578
2 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
geo/mapserver/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.7 2010/11/17 08:05:12 espie Exp $
# $OpenBSD: Makefile,v 1.8 2010/11/21 09:32:57 landry Exp $
MULTI_PACKAGES= -utils -main -php -perl
SHARED_ONLY= Yes
@ -14,6 +14,8 @@ PKGNAME-main= ${DISTNAME}
PKGNAME-utils= mapserver-utils-${V}
PKGNAME-php= php5-mapscript-${V}
PKGNAME-perl= p5-mapscript-${V}
REVISION-main= 0
REVISION-utils= 0
CATEGORIES= geo www
@ -43,8 +45,8 @@ WANTLIB= crypto curl expat freetype gif iconv idn jasper jpeg \
com_err readline termcap m png pq ssl tiff xml2 z \
proj gdal geos_c geotiff gd
WANTLIB-main= ${WANTLIB} c stdc++
WANTLIB-utils= ${WANTLIB} c stdc++
WANTLIB-main= ${WANTLIB} pthread c stdc++
WANTLIB-utils= ${WANTLIB} pthread c stdc++
WANTLIB-php= ${WANTLIB} stdc++
WANTLIB-perl= ${WANTLIB} stdc++
@ -70,7 +72,7 @@ CONFIGURE_ARGS= --with-proj=${LOCALBASE} \
--with-sos
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
LDFLAGS="-L${LOCALBASE}/lib -pthread"
MAKE_ENV= CFLAGS+=-fPIC

13
geo/mapserver/patches/patch-configure
View File

@ -1,6 +1,15 @@
$OpenBSD: patch-configure,v 1.2 2010/07/27 08:57:38 landry Exp $
$OpenBSD: patch-configure,v 1.3 2010/11/21 09:32:57 landry Exp $
--- configure.orig Thu Jul 8 22:07:15 2010
+++ configure Tue Jul 27 10:40:55 2010
+++ configure Wed Nov 17 22:14:47 2010
@@ -3360,7 +3360,7 @@ if test $ac_cv_lib_m_exp = yes; then
XTRALIBS="$XTRALIBS -lm"
fi
-XTRALIBS=$XTRALIBS
+XTRALIBS="$XTRALIBS -pthread"
echo "$as_me:$LINENO: checking for __gxx_personality_v0 in -lstdc++" >&5
@@ -9790,7 +9790,7 @@ fi
RGBA_PNG_ENABLED=$RGBA_PNG_ENABLED