Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=multilib.git;a=commitdiff;h=30429a93cb156be11d699c9446f94c4585b39de2

commit 30429a93cb156be11d699c9446f94c4585b39de2
Author: crazy <[email protected]>
Date:   Mon Nov 7 14:10:49 2016 +0100

wine-devel-1.9.22-6-x86_64
* fix symlinks
* also reset to 64 ENV at the end of the build we need right PATHs etc
* for makepkg ..

diff --git a/source/xapps-extra/wine-devel/FrugalBuild 
b/source/xapps-extra/wine-devel/FrugalBuild
index 094bc69..2ce8037 100644
--- a/source/xapps-extra/wine-devel/FrugalBuild
+++ b/source/xapps-extra/wine-devel/FrugalBuild
@@ -3,8 +3,8 @@

pkgname=wine-devel
pkgver=1.9.22
-pkgrel=5
-Finclude wine
+pkgrel=6
+Finclude wine ## don't include cross32 is included from wine.sh
source=("${source[@]}" \
"https://github.com/sarnex/wine-d3d9-patches/archive/wine-d3d9-${pkgver}.tar.gz";
 )
signatures=("${signatures[@]}" '' )
@@ -43,8 +43,13 @@ build()
Fexec cp $Fincdir/wine.conf $Fsrcdir
Ffile /etc/binfmt.d/wine.conf

-        Fln usr/i686-frugalware-linux/bin/wine-preloader usr/bin/wine-preloader
-        Fln usr/i686-frugalware-linux/bin/wine usr/bin/wine
+        Fln /usr/i686-frugalware-linux/bin/wine-preloader 
/usr/bin/wine-preloader
+        Fln /usr/i686-frugalware-linux/bin/wine /usr/bin/wine
+
+       ## we cannot use reset_and_fix here since we don't split anything
+       __cross32_unset_vars
+       __cross32_export_orig_vars
+

}
_______________________________________________
Frugalware-git mailing list
[email protected]
http://frugalware.org/mailman/listinfo/frugalware-git

Reply via email to