浏览代码

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)

Ralf S. Engelschall 19 年之前
父节点
当前提交
164b9d4952
共有 1 个文件被更改,包括 9 次插入7 次删除
  1. 9 7
      pdflib/pdflib.spec

+ 9 - 7
pdflib/pdflib.spec

@@ -37,7 +37,7 @@ Class:        BASE
 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 @@ Patch0:       pdflib.patch
 #   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 @@ AutoReqProv:  no
     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