Quellcode durchsuchen

Patch pc files more and require sed to match tabs correctly

Michael Schloh von Bennewitz vor 22 Jahren
Ursprung
Commit
3fd488baa3
1 geänderte Dateien mit 13 neuen und 5 gelöschten Zeilen
  1. 13 5
      qt/qt.spec

+ 13 - 5
qt/qt.spec

@@ -33,7 +33,7 @@ Distribution: OpenPKG [EVAL]
 Group:        XWindow
 License:      GPL
 Version:      3.2.1
-Release:      20030906
+Release:      20030908
 
 #   package library options (each 'yes' builds more libraries)
 %option       with_shared   no
@@ -50,7 +50,7 @@ Source0:      ftp://ftp.planetmirror.com.au/pub/trolltech/qt/source/qt-x11-free-
 #   build information
 Prefix:       %{l_prefix}
 BuildRoot:    %{l_buildroot}
-BuildPreReq:  OpenPKG, openpkg >= 20030103, X11, freetype, gcc
+BuildPreReq:  OpenPKG, openpkg >= 20030103, X11, freetype, gcc, sed
 PreReq:       OpenPKG, openpkg >= 20030103, X11, freetype
 %if "%{with_pgsql}" == "yes"
 BuildPreReq:  postgresql
@@ -283,11 +283,19 @@ AutoReqProv:  no
     ) || exit $?
 %endif
 
-    #   patch and prepare pkg-config (.pc) files
+    #   patch the badly generated pkg-config (.pc) files
     mv qt.pc lib
     %{l_shtool} subst \
-        -e 's;[ \t]*$;;g' \
-        -e 's;\(Libs.*$\);\1 -pthread;g' \
+        -e "s;-l/.*\.pc ;;g" \
+        -e "s;-L[^ \t]*[ \t];;g" \
+        -e "s;Libs:;Libs: %{l_ldflags} -L${l_x11_libdir};g" \
+        -e "s;\t; ;g" \
+        -e "s; \+; ;g" \
+        -e "s; *$;;g" \
+        lib/qt.pc \
+        lib/qt-mt.pc
+    %{l_shtool} subst \
+        -e "s;\(Libs.*$\);\1 -pthread;g" \
         lib/qt-mt.pc
 %endif