kpriv/pkgsrc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

make sure that the configure script is able to correctly link the test

Browse source 
Qt program on ELF platforms.
This commit is contained in:
dmcmahill 2000-08-30 16:19:42 +00:00
parent 1b5c36b2fc
commit 01ad1fed7c
3 changed files with 17 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
cad/vipec/Makefile
View file

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.17 2000/08/28 19:52:33 dmcmahill Exp $
# $NetBSD: Makefile,v 1.18 2000/08/30 16:19:42 dmcmahill Exp $
#
DISTNAME= vipec-2.0.4
@ -16,8 +16,11 @@ LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig
USE_X11= yes
EVAL_PREFIX+= QT2DIR=qt21
# make sure configure finds png
CPPFLAGS+= -I${LOCALBASE}/include
CONFIGURE_ENV+= "QTDIR=${QT2DIR}/qt21" \
all_libraries="-Wl,-R${LOCALBASE}/lib -L${LOCALBASE}/lib -Wl,-R${X11BASE}/lib -L${X11BASE}/lib"
USER_LDFLAGS="-Wl,-R${LOCALBASE}/lib -L${LOCALBASE}/lib -Wl,-R${X11BASE}/lib -L${X11BASE}/lib" \
CFLAGS="${CFLAGS}" CPPFLAGS="${CPPFLAGS}"
CONFIGURE_ARGS+= "--with-qt-dir=${QT2DIR}/qt21"
post-patch:

4
cad/vipec/files/patch-sum
View file

@ -1,5 +1,5 @@
$NetBSD: patch-sum,v 1.9 2000/08/28 19:52:34 dmcmahill Exp $
$NetBSD: patch-sum,v 1.10 2000/08/30 16:19:43 dmcmahill Exp $
MD5 (patch-aa) = 07722f7965ca78c5bb96cf339eb7ddd8
MD5 (patch-aa) = 25142bb09a67fdfb786075c2799253c8
MD5 (patch-ab) = 88aa4452920bdb56a25df5d902d05178
MD5 (patch-ac) = 232a978b2094cf9003a73e8c47460756

13
cad/vipec/patches/patch-aa
View file

@ -1,7 +1,7 @@
$NetBSD: patch-aa,v 1.6 2000/08/28 19:52:34 dmcmahill Exp $
$NetBSD: patch-aa,v 1.7 2000/08/30 16:19:43 dmcmahill Exp $
--- configure.orig Mon May 22 14:34:07 2000
+++ configure Mon Aug 28 14:15:03 2000
+++ configure Wed Aug 30 10:53:54 2000
@@ -4214,5 +4214,5 @@
x_libraries="/usr/lib"; else
x_libraries=$ac_x_libraries
@ -9,6 +9,13 @@ $NetBSD: patch-aa,v 1.6 2000/08/28 19:52:34 dmcmahill Exp $
+ X_LDFLAGS="-L$x_libraries -Wl,-R$x_libraries"
fi
all_includes="$X_INCLUDES"
@@ -4408,5 +4408,5 @@
echo "configure:4409: checking for Qt" >&5
-LIBQT="$LIBQT $X_PRE_LIBS -lXext -lX11 $LIBSOCKET"
+LIBQT="$LIBQT $X_PRE_LIBS -lXext -lX11 -lz -lpng -lSM -ljpeg -lICE $LIBSOCKET"
ac_qt_includes=NO ac_qt_libraries=NO ac_qt_bindir=NO
qt_libraries=""
@@ -4501,5 +4501,5 @@
CXXFLAGS="$CXXFLAGS -I$qt_incdir $all_includes"
@ -20,7 +27,7 @@ $NetBSD: patch-aa,v 1.6 2000/08/28 19:52:34 dmcmahill Exp $
CXXFLAGS="$CXXFLAGS -I$qt_includes"
LDFLAGS="$X_LDFLAGS"
-LIBS="-lqt -lXext -lX11 $LIBSOCKET"
+LIBS="-lqt -lXext -lX11 -lz -lpng -lSM $LIBSOCKET"
+LIBS="-lqt -lXext -lX11 -lz -lpng -lSM -ljpeg -lICE $LIBSOCKET"
LD_LIBRARY_PATH=
export LD_LIBRARY_PATH
@@ -4737,5 +4737,5 @@