From 0a6a8853a61fd1a2b0f60767bd7efa53cdc98407 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Pawe=C5=82=20Forysiuk?= Date: Thu, 28 Apr 2011 22:30:41 +0200 Subject: [PATCH] Allow to extract files from mingw packages using w64 toolchain http://mingw-w64.sourceforge.net/ --- win32/x86-mingw32-opensuse/install.sh | 26 +++++++++++++++++++++----- 1 file changed, 21 insertions(+), 5 deletions(-) diff --git a/win32/x86-mingw32-opensuse/install.sh b/win32/x86-mingw32-opensuse/install.sh index 909a523f..3d54e097 100644 --- a/win32/x86-mingw32-opensuse/install.sh +++ b/win32/x86-mingw32-opensuse/install.sh @@ -56,13 +56,29 @@ do pushd $BUILD_PATH # extract rpm rpm2cpio $DOWNLOAD_PATH/$line | cpio -i -d - # convert pkgconfig files - if [ -d $BUILD_PATH/usr/i686-pc-mingw32/sys-root/mingw/lib/pkgconfig ] + + if [ -d $BUILD_PATH/usr/i686-pc-ming32/sys-root/mingw ] then - sed -i -e 's@^prefix=.*@prefix='$INSTALL_PATH'@' -e 's@/usr/i686-pc-mingw32/sys-root/mingw@${prefix}@' $BUILD_PATH/usr/i686-pc-mingw32/sys-root/mingw/lib/pkgconfig/*.pc + # convert pkgconfig files + if [ -d $BUILD_PATH/usr/i686-pc-mingw32/sys-root/mingw/lib/pkgconfig ] + then + sed -i -e 's@^prefix=.*@prefix='$INSTALL_PATH'@' -e 's@/usr/i686-pc-mingw32/sys-root/mingw@${prefix}@' $BUILD_PATH/usr/i686-pc-mingw32/sys-root/mingw/lib/pkgconfig/*.pc + fi + # install the package + cp -rf $BUILD_PATH/usr/i686-pc-mingw32/sys-root/mingw/* $INSTALL_PATH/ fi - # install the package - cp -rf $BUILD_PATH/usr/i686-pc-mingw32/sys-root/mingw/* $INSTALL_PATH/ + + if [ -d $BUILD_PATH/usr/i686-w64-mingw32/sys-root/mingw ] + then + # convert pkgconfig files + if [ -d $BUILD_PATH/usr/i686-w64=mingw32/sys-root/mingw/lib/pkgconfig ] + then + sed -i -e 's@^prefix=.*@prefix='$INSTALL_PATH'@' -e 's@/usr/i686-w64-mingw32/sys-root/mingw@${prefix}@' $BUILD_PATH/usr/i686-w64-mingw32/sys-root/mingw/lib/pkgconfig/*.pc + fi + # install the package + cp -rf $BUILD_PATH/usr/i686-w64-mingw32/sys-root/mingw/* $INSTALL_PATH/ + fi + # remove the extracted file rm -rf $BUILD_PATH/usr popd -- 2.39.5