- enable threads

- some cosmetic while here

ok robert@
This commit is contained in:
ajacoutot 2007-01-02 11:11:18 +00:00
parent eedc265d9f
commit 2fc36d0452
2 changed files with 13 additions and 9 deletions

View File

@ -1,13 +1,14 @@
# $OpenBSD: Makefile,v 1.48 2006/10/28 11:19:20 espie Exp $
# $OpenBSD: Makefile,v 1.49 2007/01/02 11:11:18 ajacoutot Exp $
# $NetBSD: Makefile,v 1.37 2004/10/03 00:13:16 tv Exp $
COMMENT= "tools to connect your PalmOS® compatible handheld"
DISTNAME= pilot-link-0.12.1
PKGNAME= ${DISTNAME}p0
SHARED_LIBS += pisock 9.0 # .9.1
SHARED_LIBS += pisync 1.0 # .0.2
CATEGORIES= comms
CATEGORIES= comms palm
MASTER_SITES= http://downloads.pilot-link.org/ \
http://www.slackware.at/data/slackware-10.2/source/l/pilot-link/ \
http://ftp.belnet.be/mirror/rsync.gentoo.org/gentoo/distfiles/ \
@ -25,7 +26,7 @@ PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
WANTLIB= c m readline termcap z
WANTLIB= c m readline termcap z pthread
MODULES= converters/libiconv
LIB_DEPENDS= png.>=4::graphics/png \
@ -36,7 +37,9 @@ USE_LIBTOOL= Yes
CONFIGURE_STYLE= gnu
CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/include/libpng" \
LDFLAGS="-L${LOCALBASE}/lib" \
LDFLAGS="-L${LOCALBASE}/lib -pthread" \
PTHREAD_CFLAGS="-pthread" \
PTHREAD_LIBS="-pthread" \
ac_cv_lib_png_main=yes
CONFIGURE_ARGS+= ${CONFIGURE_SHARED} \
--with-libiconv=${LOCALBASE} \
@ -44,24 +47,25 @@ CONFIGURE_ARGS+= ${CONFIGURE_SHARED} \
--with-perl=/usr/bin/perl \
--with-readline \
--enable-conduits \
--enable-threads \
--without-efence \
--without-java \
--without-python \
--without-tcl
pre-configure:
@if pkg_info -e 'pilot-link-0.11.*'; then \
@if pkg_info -e 'pilot-link-*'; then \
echo 1>&2 "+-------------------"; \
echo 1>&2 "| Error: you must remove the existing pilot-link installation"; \
echo 1>&2 "| before compiling this version. To fully remove run"; \
echo 1>&2 "| these commands as user root"; \
echo 1>&2 "|"; \
echo 1>&2 "| pkg_delete pilot-link"; \
echo 1>&2 "|"; \
echo 1>&2 "+-------------------"; \
exit 1; \
fi
perl -pi -e "s,\@\@CFLAGS\@\@,${CFLAGS},g" ${WRKSRC}/bindings/Perl/Makefile.PL.in
perl -pi -e "s,!!CFLAGS!!,${CFLAGS},g" ${WRKSRC}/bindings/Perl/Makefile.PL.in
perl -pi -e "s,Libs: ,Libs: -pthread ,g" ${WRKSRC}/pilot-link-pp.pc.in
post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/pilot-link

View File

@ -1,4 +1,4 @@
$OpenBSD: patch-bindings_Perl_Makefile_PL_in,v 1.1 2006/10/20 11:48:06 ajacoutot Exp $
$OpenBSD: patch-bindings_Perl_Makefile_PL_in,v 1.2 2007/01/02 11:11:18 ajacoutot Exp $
--- bindings/Perl/Makefile.PL.in.orig Tue Mar 14 15:48:06 2006
+++ bindings/Perl/Makefile.PL.in Thu Oct 19 12:24:40 2006
@@ -41,8 +41,9 @@ WriteMakefile(
@ -10,5 +10,5 @@ $OpenBSD: patch-bindings_Perl_Makefile_PL_in,v 1.1 2006/10/20 11:48:06 ajacoutot
'dynamic_lib'=> {'OTHERLDFLAGS' => $lib},
'depend' => {'Pilot.c' => 'const-c.inc const-xs.inc'},
'clean' => {'FILES' => 'const-c.inc const-xs.inc'},
+ 'OPTIMIZE' => "@@CFLAGS@@",
+ 'OPTIMIZE' => "!!CFLAGS!!",
);