diff options
| author | Thierry Thomas <thierry@FreeBSD.org> | 2004-04-24 19:34:55 +0000 |
|---|---|---|
| committer | Thierry Thomas <thierry@FreeBSD.org> | 2004-04-24 19:34:55 +0000 |
| commit | ed23609d109b698064ec4ea50376f13c9a6c0e06 (patch) | |
| tree | f538bd0a75883ab42897f508fbfef324f9f7d669 | |
| parent | fe9010cb8ae4efe57bf0a0c2f90862d206b7e47c (diff) | |
| download | ports-ed23609d109b698064ec4ea50376f13c9a6c0e06.tar.gz ports-ed23609d109b698064ec4ea50376f13c9a6c0e06.zip | |
Unbreak package building.
On FreeBSD-STABLE, it seems impossible to link with -liodbc.3 without
giving PTHREAD_LIBS (and PTHREAD_CFLAGS), then the ODBC driver was not
built.
Approved by: portmgr (marcus).
Notes
Notes:
svn path=/head/; revision=107804
| -rw-r--r-- | databases/clip/Makefile | 3 | ||||
| -rw-r--r-- | databases/clip/files/patch-cliplibs::clip-odbc::configure | 10 |
2 files changed, 8 insertions, 5 deletions
diff --git a/databases/clip/Makefile b/databases/clip/Makefile index d70bcea90a95..4280b0568ab9 100644 --- a/databases/clip/Makefile +++ b/databases/clip/Makefile @@ -7,6 +7,7 @@ PORTNAME= clip PORTVERSION= 1.1.9.1 +PORTREVISION= 1 CATEGORIES= databases lang MASTER_SITES= ftp://ftp.linux.ru.net/mirrors/clip/ \ ftp://ftp.lastik.ru/clip/ \ @@ -104,6 +105,8 @@ pre-configure: -e "s|#!/bin/sh|#!${LOCALBASE}/bin/bash|" \ -e "s|/usr/local|${LOCALBASE}|g" \ -e "s|/usr/X11R6|${X11BASE}|g" + @${REINPLACE_CMD} -e "s|%%PTHREAD_CFLAGS%%|${PTHREAD_CFLAGS}|" \ + -e "s|%%PTHREAD_LIBS%%|${PTHREAD_LIBS}|" ${WRKSRC}/cliplibs/clip-odbc/configure do-install: ${CP} -R ${WRKDIR}/cliproot ${PREFIX}/clip diff --git a/databases/clip/files/patch-cliplibs::clip-odbc::configure b/databases/clip/files/patch-cliplibs::clip-odbc::configure index f43975530101..bf61aaca3838 100644 --- a/databases/clip/files/patch-cliplibs::clip-odbc::configure +++ b/databases/clip/files/patch-cliplibs::clip-odbc::configure @@ -1,11 +1,11 @@ ---- cliplibs/clip-odbc/configure.orig Mon May 27 12:25:29 2002 -+++ cliplibs/clip-odbc/configure Sat Sep 20 23:46:44 2003 -@@ -21,11 +21,11 @@ +--- cliplibs/clip-odbc/configure.orig Fri Dec 26 11:34:59 2003 ++++ cliplibs/clip-odbc/configure Sat Apr 24 15:52:06 2004 +@@ -22,11 +22,11 @@ LIBODBC='' LIBOOB='' -gcc -o test_odbc test_odbc.c -liodbc >/dev/null 2>&1 && LIBODBC='-liodbc' && echo 'iODBC driver manager were found' -+gcc -o test_odbc test_odbc.c -I/usr/local/include -L/usr/local/lib -liodbc >/dev/null 2>&1 && LIBODBC='-liodbc' && echo 'iODBC driver manager were found' ++gcc -o test_odbc test_odbc.c %%PTHREAD_CFLAGS%% -I/usr/local/include -L/usr/local/lib %%PTHREAD_LIBS%% -liodbc >/dev/null 2>&1 && LIBODBC='-liodbc' && echo 'iODBC driver manager were found' if [ -z "$LIBODBC" ] then @@ -14,7 +14,7 @@ fi if [ -z "$LIBODBC" ] -@@ -36,6 +36,6 @@ +@@ -37,6 +37,6 @@ gcc -o test_odbc test_odbc.c -L/usr/local/easysoft/oob/client -lesoobclient >/dev/null 2>&1 && LIBOOB='-L\/usr\/local\/easysoft\/oob\/client -lesoobclient' && echo 'ODBC-ODBC bridge client were found' |