From 4047f8343253d7a3eeb1524faeea969196aa3cbe11650179be363ea470e89a8c Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Wed, 13 Apr 2011 08:48:20 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/windows:mingw:win64/mingw64-filesystem?expand=0&rev=32 --- macros.mingw64 | 3 +++ mingw64-find-provides.sh | 6 ++++++ mingw64-find-requires.sh | 6 ++++++ 3 files changed, 15 insertions(+) diff --git a/macros.mingw64 b/macros.mingw64 index 9f5a33d..8657114 100644 --- a/macros.mingw64 +++ b/macros.mingw64 @@ -160,13 +160,16 @@ package or when debugging this package.\ -DCMAKE_VERBOSE_MAKEFILE=ON \\\ -DCMAKE_INSTALL_PREFIX:PATH=%{_mingw64_prefix} \\\ -DCMAKE_INSTALL_LIBDIR:PATH=%{_mingw64_libdir} \\\ + -DBIN_INSTALL_DIR=%{_mingw64_bindir} \\\ -DINCLUDE_INSTALL_DIR:PATH=%{_mingw64_includedir} \\\ -DLIB_INSTALL_DIR:PATH=%{_mingw64_libdir} \\\ + -DSHARE_INSTALL_DIR:PATH=%{_mingw64_datadir} \\\ -DSYSCONF_INSTALL_DIR:PATH=%{_mingw64_sysconfdir} \\\ -DSHARE_INSTALL_PREFIX:PATH=%{_mingw64_datadir} \\\ -DBUILD_SHARED_LIBS:BOOL=ON \\\ -DCMAKE_C_COMPILER="%{_bindir}/%{_mingw64_cc}" \\\ -DCMAKE_CXX_COMPILER="%{_bindir}/%{_mingw64_cxx}" \\\ + -DCMAKE_RC_COMPILER="%{_bindir}/%{_mingw64_windres}" \\\ -DCMAKE_FIND_ROOT_PATH="%{_mingw64_prefix}" \\\ -DCMAKE_FIND_ROOT_PATH_MODE_LIBRARY=ONLY \\\ -DCMAKE_FIND_ROOT_PATH_MODE_INCLUDE=ONLY \\\ diff --git a/mingw64-find-provides.sh b/mingw64-find-provides.sh index bcb422a..e1c58ae 100644 --- a/mingw64-find-provides.sh +++ b/mingw64-find-provides.sh @@ -13,8 +13,14 @@ fi filelist=`sed "s/['\"]/\\\&/g"` dlls=$(echo $filelist | tr [:blank:] '\n' | grep '\.dll$') +pcs=$(echo $filelist | tr [:blank:] '\n' | grep '\.pc$') for f in $dlls; do basename=`basename $f | tr [:upper:] [:lower:]` echo "mingw64($basename)" done + +for g in $pcs; do + dirname=`dirname $g` + PKG_CONFIG_PATH=$dirname x86_64-w64-mingw32-pkg-config --print-errors --print-provides $g | awk '{ print "mingw64(pkg:"$1")", $2, $3 }' +done | sort -u diff --git a/mingw64-find-requires.sh b/mingw64-find-requires.sh index 0ff79c6..fb1a192 100644 --- a/mingw64-find-requires.sh +++ b/mingw64-find-requires.sh @@ -68,6 +68,7 @@ done dlls=$(echo $filelist | tr [:blank:] '\n' | grep -Ei '\.(dll|exe)$') +pcs=$(echo $filelist | tr [:blank:] '\n' | grep '\.pc$') for f in $dlls; do $OBJDUMP -p $f | grep 'DLL Name' | tr [:upper:] [:lower:] | @@ -75,3 +76,8 @@ for f in $dlls; do grep -Ev "$exclude_pattern" | sed 's/\(.*\)/mingw64(\1)/' done | sort -u + +for g in $pcs; do + dirname=`dirname $g` + PKG_CONFIG_PATH=$dirname x86_64-w64-mingw32-pkg-config --print-errors --print-requires $g | awk '{ print "mingw64(pkg:"$1")", $2, $3 }' +done | sort -u