OBS-URL: https://build.opensuse.org/package/show/windows:mingw:win64/mingw64-filesystem?expand=0&rev=30

2011-03-15 11:44:43 +00:00 · 2011-03-15 11:44:43 +00:00 · 2f035bb721
commit 2f035bb721
parent ed5dc80141
7 changed files with 45 additions and 45 deletions
--- a/macros.mingw64
+++ b/macros.mingw64
@ -1,4 +1,4 @@
-%_mingw64_target          x86_64-pc-mingw32
+%_mingw64_target          x86_64-w64-mingw32

 # Paths.
 %_mingw64_sysroot         %{_prefix}/%{_mingw64_target}/sys-root
--- a/mingw64-filesystem.spec
+++ b/mingw64-filesystem.spec
@ -66,34 +66,34 @@ install -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/rpm/macros.mingw64
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/rpmlint
 install -m 644 %{SOURCE7} $RPM_BUILD_ROOT%{_sysconfdir}/rpmlint/

-mkdir -p $RPM_BUILD_ROOT%{_prefix}/x86_64-pc-mingw32
+mkdir -p $RPM_BUILD_ROOT%{_prefix}/x86_64-w64-mingw32

 # GCC requires these directories, even though they contain links
 # to binaries which are also installed in /usr/bin etc.  These
 # contain Fedora native binaries.
-mkdir -p $RPM_BUILD_ROOT%{_prefix}/x86_64-pc-mingw32/bin
+mkdir -p $RPM_BUILD_ROOT%{_prefix}/x86_64-w64-mingw32/bin

 # The MinGW system root which will contain Windows native binaries
 # and Windows-specific header files, pkgconfig, etc.
-mkdir -p $RPM_BUILD_ROOT%{_prefix}/x86_64-pc-mingw32/sys-root/mingw
-mkdir -p $RPM_BUILD_ROOT%{_prefix}/x86_64-pc-mingw32/sys-root/mingw/bin
-mkdir -p $RPM_BUILD_ROOT%{_prefix}/x86_64-pc-mingw32/sys-root/mingw/include
-mkdir -p $RPM_BUILD_ROOT%{_prefix}/x86_64-pc-mingw32/sys-root/mingw/include/sys
-mkdir -p $RPM_BUILD_ROOT%{_prefix}/x86_64-pc-mingw32/sys-root/mingw/lib
-mkdir -p $RPM_BUILD_ROOT%{_prefix}/x86_64-pc-mingw32/sys-root/mingw/lib/pkgconfig
-mkdir -p $RPM_BUILD_ROOT%{_prefix}/x86_64-pc-mingw32/sys-root/mingw/share
-mkdir -p $RPM_BUILD_ROOT%{_prefix}/x86_64-pc-mingw32/sys-root/mingw/share/pkgconfig
+mkdir -p $RPM_BUILD_ROOT%{_prefix}/x86_64-w64-mingw32/sys-root/mingw
+mkdir -p $RPM_BUILD_ROOT%{_prefix}/x86_64-w64-mingw32/sys-root/mingw/bin
+mkdir -p $RPM_BUILD_ROOT%{_prefix}/x86_64-w64-mingw32/sys-root/mingw/include
+mkdir -p $RPM_BUILD_ROOT%{_prefix}/x86_64-w64-mingw32/sys-root/mingw/include/sys
+mkdir -p $RPM_BUILD_ROOT%{_prefix}/x86_64-w64-mingw32/sys-root/mingw/lib
+mkdir -p $RPM_BUILD_ROOT%{_prefix}/x86_64-w64-mingw32/sys-root/mingw/lib/pkgconfig
+mkdir -p $RPM_BUILD_ROOT%{_prefix}/x86_64-w64-mingw32/sys-root/mingw/share
+mkdir -p $RPM_BUILD_ROOT%{_prefix}/x86_64-w64-mingw32/sys-root/mingw/share/pkgconfig

-mkdir -p $RPM_BUILD_ROOT%{_prefix}/x86_64-pc-mingw32/sys-root/mingw/share/aclocal
+mkdir -p $RPM_BUILD_ROOT%{_prefix}/x86_64-w64-mingw32/sys-root/mingw/share/aclocal

-(cd $RPM_BUILD_ROOT%{_prefix}/x86_64-pc-mingw32 && ln -s sys-root/mingw/include include && ln -s sys-root/mingw/lib lib)
-(cd $RPM_BUILD_ROOT%{_prefix}/x86_64-pc-mingw32/sys-root && ln -s mingw x86_64-pc-mingw32)
+(cd $RPM_BUILD_ROOT%{_prefix}/x86_64-w64-mingw32 && ln -s sys-root/mingw/include include && ln -s sys-root/mingw/lib lib)
+(cd $RPM_BUILD_ROOT%{_prefix}/x86_64-w64-mingw32/sys-root && ln -s mingw x86_64-w64-mingw32)

-mkdir -p $RPM_BUILD_ROOT%{_prefix}/x86_64-pc-mingw32/sys-root/mingw/share
-mkdir -p $RPM_BUILD_ROOT%{_prefix}/x86_64-pc-mingw32/sys-root/mingw/share/doc
-mkdir -p $RPM_BUILD_ROOT%{_prefix}/x86_64-pc-mingw32/sys-root/mingw/share/info
-mkdir -p $RPM_BUILD_ROOT%{_prefix}/x86_64-pc-mingw32/sys-root/mingw/share/man
-mkdir -p $RPM_BUILD_ROOT%{_prefix}/x86_64-pc-mingw32/sys-root/mingw/share/man/man{1,2,3,4,5,6,7,8,9,n}
+mkdir -p $RPM_BUILD_ROOT%{_prefix}/x86_64-w64-mingw32/sys-root/mingw/share
+mkdir -p $RPM_BUILD_ROOT%{_prefix}/x86_64-w64-mingw32/sys-root/mingw/share/doc
+mkdir -p $RPM_BUILD_ROOT%{_prefix}/x86_64-w64-mingw32/sys-root/mingw/share/info
+mkdir -p $RPM_BUILD_ROOT%{_prefix}/x86_64-w64-mingw32/sys-root/mingw/share/man
+mkdir -p $RPM_BUILD_ROOT%{_prefix}/x86_64-w64-mingw32/sys-root/mingw/share/man/man{1,2,3,4,5,6,7,8,9,n}

 # NB. NOT _libdir
 mkdir -p $RPM_BUILD_ROOT/usr/lib/rpm
@ -115,7 +115,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_sysconfdir}/rpmlint/mingw64-rpmlint.config
 %{_bindir}/mingw64-*
 %{_prefix}/lib/mingw64-scripts
-%{_prefix}/x86_64-pc-mingw32/
+%{_prefix}/x86_64-w64-mingw32/
 /usr/lib/rpm/mingw64-*


--- a/mingw64-find-debuginfo.sh
+++ b/mingw64-find-debuginfo.sh
@ -8,7 +8,7 @@ fi

 for f in `find $RPM_BUILD_ROOT -type f -name "*.exe" -or -name "*.dll"`
 do
-	case $(x86_64-pc-mingw32-objdump -h $f 2>/dev/null | egrep -o '(debug[\.a-z_]*|gnu.version)') in
+	case $(x86_64-w64-mingw32-objdump -h $f 2>/dev/null | egrep -o '(debug[\.a-z_]*|gnu.version)') in
 	    *debuglink*) continue ;;
 	    *debug*) ;;
 	    *gnu.version*)
@ -19,9 +19,9 @@ do
 	esac

 	echo extracting debug info from $f
-	x86_64-pc-mingw32-objcopy --only-keep-debug $f $f.debug || :
+	x86_64-w64-mingw32-objcopy --only-keep-debug $f $f.debug || :
 	pushd `dirname $f`
-	x86_64-pc-mingw32-objcopy --add-gnu-debuglink=`basename $f.debug` --strip-unneeded `basename $f` || :
+	x86_64-w64-mingw32-objcopy --add-gnu-debuglink=`basename $f.debug` --strip-unneeded `basename $f` || :
 	popd
 done

--- a/mingw64-find-provides.sh
+++ b/mingw64-find-provides.sh
@ -8,7 +8,7 @@ then
   package_name="$1"
 fi

-[ -z "$OBJDUMP" ] && OBJDUMP=x86_64-pc-mingw32-objdump
+[ -z "$OBJDUMP" ] && OBJDUMP=x86_64-w64-mingw32-objdump

 filelist=`sed "s/['\"]/\\\&/g"`

--- a/mingw64-find-requires.sh
+++ b/mingw64-find-requires.sh
@ -8,7 +8,7 @@ then
   package_name="$1"
 fi

-[ -z "$OBJDUMP" ] && OBJDUMP=x86_64-pc-mingw32-objdump
+[ -z "$OBJDUMP" ] && OBJDUMP=x86_64-w64-mingw32-objdump

 # Get the list of files.

--- a/mingw64-install-post.sh
+++ b/mingw64-install-post.sh
@ -14,10 +14,10 @@ LC_TIME=POSIX

 cd $RPM_BUILD_ROOT

-[ -z "$STRIP" ] && STRIP=x86_64-pc-mingw32-strip
+[ -z "$STRIP" ] && STRIP=x86_64-w64-mingw32-strip

 for f in `find . -type f -name "*.exe" -or -name "*.dll"`; do
-	case $(x86_64-pc-mingw32-objdump -h $f 2>/dev/null | egrep -o '(debug[\.a-z_]*|gnu.version)') in
+	case $(x86_64-w64-mingw32-objdump -h $f 2>/dev/null | egrep -o '(debug[\.a-z_]*|gnu.version)') in
 	    *debuglink*) continue ;;
 	    *debug*) ;;
 	    *gnu.version*)
@ -36,8 +36,8 @@ for f in `find . -name "*.la"`; do
 	rm -f $f;
 done

-if [ -d "$RPM_BUILD_ROOT/usr/x86_64-pc-mingw32/sys-root/mingw/share/man" ]; then
-    pushd $RPM_BUILD_ROOT/usr/x86_64-pc-mingw32/sys-root/mingw/share/man
+if [ -d "$RPM_BUILD_ROOT/usr/x86_64-w64-mingw32/sys-root/mingw/share/man" ]; then
+    pushd $RPM_BUILD_ROOT/usr/x86_64-w64-mingw32/sys-root/mingw/share/man
    for f in `find -type f`; do
 	    case "$f" in
 	        *.Z) gunzip $f; b=`echo $f | sed -e 's/\.Z$//'`;;
@ -51,8 +51,8 @@ if [ -d "$RPM_BUILD_ROOT/usr/x86_64-pc-mingw32/sys-root/mingw/share/man" ]; then
 fi
    

-if [ -d "$RPM_BUILD_ROOT/usr/x86_64-pc-mingw32/sys-root/mingw/share/info" ]; then
-    pushd $RPM_BUILD_ROOT/usr/x86_64-pc-mingw32/sys-root/mingw/share/info
+if [ -d "$RPM_BUILD_ROOT/usr/x86_64-w64-mingw32/sys-root/mingw/share/info" ]; then
+    pushd $RPM_BUILD_ROOT/usr/x86_64-w64-mingw32/sys-root/mingw/share/info
    for f in `find -type f`; do
 	    case "$f" in
 	        *.Z) gunzip $f; b=`echo $f | sed -e 's/\.Z$//'`;;
@ -65,30 +65,30 @@ if [ -d "$RPM_BUILD_ROOT/usr/x86_64-pc-mingw32/sys-root/mingw/share/info" ]; the
 	popd
 fi
    
-if [ -d "$RPM_BUILD_ROOT/usr/x86_64-pc-mingw32/sys-root/mingw/lib/pkgconfig" ]; then
-    pushd $RPM_BUILD_ROOT/usr/x86_64-pc-mingw32/sys-root/mingw/lib/pkgconfig
+if [ -d "$RPM_BUILD_ROOT/usr/x86_64-w64-mingw32/sys-root/mingw/lib/pkgconfig" ]; then
+    pushd $RPM_BUILD_ROOT/usr/x86_64-w64-mingw32/sys-root/mingw/lib/pkgconfig
    for f in `find -name \*.pc`; do
        mv $f $f~
        sed \
-         -e 's#L/usr/x86_64-pc-mingw32/sys-root/mingw/lib#L\${libdir}#g' \
-         -e 's#I/usr/x86_64-pc-mingw32/sys-root/mingw/include#I\${includedir}#g' \
-         -e 's#/usr/x86_64-pc-mingw32/sys-root/mingw#\${prefix}#g' \
-         -e 's#^prefix=\${prefix}#prefix=/usr/x86_64-pc-mingw32/sys-root/mingw#g' \
+         -e 's#L/usr/x86_64-w64-mingw32/sys-root/mingw/lib#L\${libdir}#g' \
+         -e 's#I/usr/x86_64-w64-mingw32/sys-root/mingw/include#I\${includedir}#g' \
+         -e 's#/usr/x86_64-w64-mingw32/sys-root/mingw#\${prefix}#g' \
+         -e 's#^prefix=\${prefix}#prefix=/usr/x86_64-w64-mingw32/sys-root/mingw#g' \
         < $f~ > $f;
        rm -f $f~
    done
    popd
 fi
    
-if [ -d "$RPM_BUILD_ROOT/usr/x86_64-pc-mingw32/sys-root/mingw/share/pkgconfig" ]; then
-    pushd $RPM_BUILD_ROOT/usr/x86_64-pc-mingw32/sys-root/mingw/share/pkgconfig
+if [ -d "$RPM_BUILD_ROOT/usr/x86_64-w64-mingw32/sys-root/mingw/share/pkgconfig" ]; then
+    pushd $RPM_BUILD_ROOT/usr/x86_64-w64-mingw32/sys-root/mingw/share/pkgconfig
    for f in `find -name \*.pc`; do
        mv $f $f~
        sed \
-         -e 's#L/usr/x86_64-pc-mingw32/sys-root/mingw/lib#L\${libdir}#g' \
-         -e 's#I/usr/x86_64-pc-mingw32/sys-root/mingw/include#I\${includedir}#g' \
-         -e 's#/usr/x86_64-pc-mingw32/sys-root/mingw#\${prefix}#g' \
-         -e 's#^prefix=\${prefix}#prefix=/usr/x86_64-pc-mingw32/sys-root/mingw#g' \
+         -e 's#L/usr/x86_64-w64-mingw32/sys-root/mingw/lib#L\${libdir}#g' \
+         -e 's#I/usr/x86_64-w64-mingw32/sys-root/mingw/include#I\${includedir}#g' \
+         -e 's#/usr/x86_64-w64-mingw32/sys-root/mingw#\${prefix}#g' \
+         -e 's#^prefix=\${prefix}#prefix=/usr/x86_64-w64-mingw32/sys-root/mingw#g' \
         < $f~ > $f;
        rm -f $f~
    done
--- a/mingw64-rpmlint.config
+++ b/mingw64-rpmlint.config
@ -1,8 +1,8 @@
 # Unconditionally remove devel-file-in-non-devel rpmlint warning.
 addFilter ("^mingw64-.*devel-file-in-non-devel")

-# /usr/x86_64-pc-mingw32 is permitted by MinGW packaging guidelines.
-addFilter ("^mingw64-.*non-standard-dir-in-usr x86_64-pc-mingw32")
+# /usr/x86_64-w64-mingw32 is permitted by MinGW packaging guidelines.
+addFilter ("^mingw64-.*non-standard-dir-in-usr x86_64-w64-mingw32")

 # GCC and libtool create executable archive files.  It's not clear
 # why, but we permit this for now.