瀏覽代碼

make sure OpenPKG Qt is found before a possibly existing Qt inside the vendor X11R6 area

Ralf S. Engelschall 22 年之前
父節點
當前提交
8a2b93c429
共有 3 個文件被更改,包括 10 次插入9 次删除
  1. 3 3
      kde-arts/kde-arts.spec
  2. 4 3
      kde-base/kde-base.spec
  3. 3 3
      kde-libs/kde-libs.spec

+ 3 - 3
kde-arts/kde-arts.spec

@@ -37,7 +37,7 @@ Distribution: OpenPKG [EVAL]
 Group:        KDE
 License:      GPL
 Version:      %{V_arts}
-Release:      20030818
+Release:      20030830
 
 #   list of sources
 Source0:      ftp://ftp.kde.org/pub/kde/stable/%{V_kde}/src/arts-%{V_arts}.tar.bz2
@@ -65,8 +65,8 @@ AutoReqProv:  no
 
 %build
     #   set standard KDE/Qt build environment
-    export CC="%{l_cc}"
-    export CXX="%{l_cxx}"
+    export CC="%{l_cc} `%{l_prefix}/bin/pkg-config --libs-only-L kde-qt`"
+    export CXX="%{l_cxx} `%{l_prefix}/bin/pkg-config --libs-only-L kde-qt`"
     export CFLAGS="`%{l_prefix}/bin/pkg-config --cflags-only-other kde-qt` %{l_cflags -O}"
     export CXXFLAGS="`%{l_prefix}/bin/pkg-config --cflags-only-other kde-qt` %{l_cxxflags -O}"
     export CPPFLAGS="`%{l_prefix}/bin/pkg-config --cflags-only-I kde-qt` %{l_cppflags}"

+ 4 - 3
kde-base/kde-base.spec

@@ -37,7 +37,7 @@ Distribution: OpenPKG [EVAL]
 Group:        KDE
 License:      GPL
 Version:      %{V_base}
-Release:      20030818
+Release:      20030830
 
 #   list of sources
 Source0:      ftp://ftp.kde.org/pub/kde/stable/%{V_kde}/src/kdebase-%{V_base}.tar.bz2
@@ -92,8 +92,8 @@ AutoReqProv:  no
 
 %build
     #   set standard KDE/Qt build environment
-    export CC="%{l_cc}"
-    export CXX="%{l_cxx}"
+    export CC="%{l_cc} `%{l_prefix}/bin/pkg-config --libs-only-L kde-qt`"
+    export CXX="%{l_cxx} `%{l_prefix}/bin/pkg-config --libs-only-L kde-qt`"
     export CFLAGS="`%{l_prefix}/bin/pkg-config --cflags-only-other kde-qt` %{l_cflags -O}"
     export CXXFLAGS="`%{l_prefix}/bin/pkg-config --cflags-only-other kde-qt` %{l_cxxflags -O}"
     export CPPFLAGS="`%{l_prefix}/bin/pkg-config --cflags-only-I kde-qt` %{l_cppflags}"
@@ -127,6 +127,7 @@ AutoReqProv:  no
     export kde_widgetdir='\${prefix}/lib/kde/plugins/designer'
 
     #   configure package
+    export DO_NOT_COMPILE="kdm"
     ./configure \
         --prefix=%{l_prefix} \
         --bindir=%{l_prefix}/libexec/kde \

+ 3 - 3
kde-libs/kde-libs.spec

@@ -37,7 +37,7 @@ Distribution: OpenPKG [EVAL]
 Group:        KDE
 License:      GPL
 Version:      %{V_libs}
-Release:      20030818
+Release:      20030830
 
 #   list of sources
 Source0:      ftp://ftp.kde.org/pub/kde/stable/%{V_kde}/src/kdelibs-%{V_libs}.tar.bz2
@@ -75,8 +75,8 @@ AutoReqProv:  no
 
 %build
     #   set standard KDE/Qt build environment
-    export CC="%{l_cc}"
-    export CXX="%{l_cxx}"
+    export CC="%{l_cc} `%{l_prefix}/bin/pkg-config --libs-only-L kde-qt`"
+    export CXX="%{l_cxx} `%{l_prefix}/bin/pkg-config --libs-only-L kde-qt`"
     export CFLAGS="`%{l_prefix}/bin/pkg-config --cflags-only-other kde-qt` %{l_cflags -O}"
     export CXXFLAGS="`%{l_prefix}/bin/pkg-config --cflags-only-other kde-qt` %{l_cxxflags -O}"
     export CPPFLAGS="`%{l_prefix}/bin/pkg-config --cflags-only-I kde-qt` %{l_cppflags}"