pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/archivers/xmill Honor CC and LDFLAGS to create correct...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/816d86e59e2f
branches:  trunk
changeset: 476572:816d86e59e2f
user:      minskim <minskim%pkgsrc.org@localhost>
date:      Tue Jun 15 04:11:15 2004 +0000

description:
Honor CC and LDFLAGS to create correctly linked binaries when pkgsrc
bzip2 library is used instead of native one.

diffstat:

 archivers/xmill/distinfo         |   3 ++-
 archivers/xmill/patches/patch-aa |  29 +++++++++++++++++++++++++++++
 2 files changed, 31 insertions(+), 1 deletions(-)

diffs (43 lines):

diff -r 696cad45dbdf -r 816d86e59e2f archivers/xmill/distinfo
--- a/archivers/xmill/distinfo  Tue Jun 15 02:36:47 2004 +0000
+++ b/archivers/xmill/distinfo  Tue Jun 15 04:11:15 2004 +0000
@@ -1,4 +1,5 @@
-$NetBSD: distinfo,v 1.3 2004/03/29 05:12:01 ben Exp $
+$NetBSD: distinfo,v 1.4 2004/06/15 04:11:15 minskim Exp $
 
 SHA1 (xmill-0.9.1.tar.gz) = 491e44ea9a66293af6837db4dc54ed63065c0d67
 Size (xmill-0.9.1.tar.gz) = 1021363 bytes
+SHA1 (patch-aa) = b4f10f11906bdcc927214823f93ef597c0d4b750
diff -r 696cad45dbdf -r 816d86e59e2f archivers/xmill/patches/patch-aa
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/archivers/xmill/patches/patch-aa  Tue Jun 15 04:11:15 2004 +0000
@@ -0,0 +1,29 @@
+$NetBSD: patch-aa,v 1.3 2004/06/15 04:11:15 minskim Exp $
+
+--- makefile.orig      2004-03-15 18:17:57.000000000 -0600
++++ makefile
+@@ -43,11 +43,11 @@ INSPECTSRC = ./xmillinspect
+ PPMZIPSRC = ./ppmzip
+ PPMSRC = ./ppmdi
+ 
+-CPP = g++
+-CC = gcc
+-LINK = g++
++CPP = ${CXX}
++#CC = gcc
++LINK = ${CXX}
+ 
+-CFLAGS = -c
++CFLAGS += -c
+ 
+ # To use MSXML.  Does not work with GCC on Windows (mingw)
+ #CFLAGS = -c -DHAVE_MSXML
+@@ -84,7 +84,7 @@ CPPFLAGS_XDEMILL = $(CFLAGS) ${CPPFLAGS_
+ CPPFLAGS_XMILLTEST = $(CFLAGS) -IXMill
+ CPPFLAGS_PPMZIP = $(CFLAGS) -Ippmdi
+ 
+-LDLIBS=${ZLIB_LDFLAGS} ${BZLIB_LDFLAGS}
++LDLIBS=${LDFLAGS} ${ZLIB_LDFLAGS} ${BZLIB_LDFLAGS}
+ # LINK_FLAGS = -L.
+ 
+ XMILLLIB_MISC  =  \



Home | Main Index | Thread Index | Old Index