OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 10-Oct-2006 08:56:33
Branch: HEAD Handle: 2006101007563200
Modified files:
openpkg-src/pdflib pdflib.spec
Log:
workaround Makefile dependency problems by passing full filenames in
the XXXXLINK variables and using the linker flags in LDFLAGS to
workaround resulting libtool annoyances (linking against bla bla is
not portable and hence avoided, etc)
Summary:
Revision Changes Path
1.49 +9 -7 openpkg-src/pdflib/pdflib.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/pdflib/pdflib.spec
============================================================================
$ cvs diff -u -r1.48 -r1.49 pdflib.spec
--- openpkg-src/pdflib/pdflib.spec 7 Oct 2006 10:26:35 -0000 1.48
+++ openpkg-src/pdflib/pdflib.spec 10 Oct 2006 06:56:32 -0000 1.49
@@ -37,7 +37,7 @@
Group: Postscript
License: PDFlib
Version: %{V_long}
-Release: 20061007
+Release: 20061010
# list of sources
Source0:
http://www.pdflib.de/binaries/PDFlib/%{V_comp}/PDFlib-Lite-%{V_long}.tar.gz
@@ -46,8 +46,10 @@
# build information
Prefix: %{l_prefix}
BuildRoot: %{l_buildroot}
-BuildPreReq: OpenPKG, openpkg >= 20040130, png, zlib, jpeg, coreutils, make
-PreReq: OpenPKG, openpkg >= 20040130, png, zlib, jpeg
+BuildPreReq: OpenPKG, openpkg >= 20040130, coreutils, make
+PreReq: OpenPKG, openpkg >= 20040130
+BuildPreReq: png, zlib, jpeg
+PreReq: png, zlib, jpeg
AutoReq: no
AutoReqProv: no
@@ -83,12 +85,12 @@
CFLAGS="%{l_cflags -O}" \
INSTALL="%{l_shtool} install -c" \
PNGLIBINC="%{l_cppflags libpng .}" \
- PNGLIBLINK="-lpng" \
+ PNGLIBLINK="%{l_prefix}/lib/libpng.a" \
JPEGLIBINC="%{l_cppflags}" \
- JPEGLIBLINK="-ljpeg" \
+ JPEGLIBLINK="%{l_prefix}/lib/libjpeg.a" \
FLATELIBINC="%{l_cppflags}" \
- FLATELIBLINK="-lz" \
- LDFLAGS="%{l_ldflags}" \
+ FLATELIBLINK="%{l_prefix}/lib/libz.a" \
+ LDFLAGS="%{l_ldflags} -lpng -ljpeg -lz" \
./configure \
--prefix=%{l_prefix} \
--disable-shared
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [email protected]
