Pisilinux/main
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:pisilinux/main

Browse Source
This commit is contained in:
Ertuğrul Erata
2016-07-09 18:06:49 +03:00
parent 0599348c57 3a5c333566
commit 4a843f77dc
6 changed files with 105 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
hardware/emulator/wine/actions.py
+1 -2
View File
@@ -24,7 +24,7 @@ def setup():
# More info can be obtained here: http://wiki.winehq.org/Wine64
# shelltools.export("CPPFLAGS", "-D_FORTIFY_SOURCE=2 -D_FORTIFY_SOURCE=0")
shelltools.system("make -C ./wine-staging-%s/patches DESTDIR=$(pwd) install" %get.srcVERSION())
#shelltools.system("make -C ./wine-staging-%s/patches DESTDIR=$(pwd) install" %get.srcVERSION())
pisitools.flags.add("-fno-omit-frame-pointer")
autotools.autoreconf("-vif")
options = "--without-capi \
@@ -76,4 +76,3 @@ def install():
shelltools.cd("..")
pisitools.dodoc("ANNOUNCE", "AUTHORS", "COPYING.LIB", "LICENSE*", "README", "documentation/README.*")
hardware/emulator/wine/files/gcc_erorr.patch
+57
View File
@@ -0,0 +1,57 @@
diff --git a/tools/winebuild/main.c b/tools/winebuild/main.c
index 16b4165..5c77267 100644
--- a/tools/winebuild/main.c
+++ b/tools/winebuild/main.c
@@ -48,10 +48,13 @@ int link_ext_symbols = 0;
int force_pointer_size = 0;
int unwind_tables = 0;
+#undef FORCE_POINTER_SIZE
#ifdef __i386__
enum target_cpu target_cpu = CPU_x86;
+#define FORCE_POINTER_SIZE
#elif defined(__x86_64__)
enum target_cpu target_cpu = CPU_x86_64;
+#define FORCE_POINTER_SIZE
#elif defined(__powerpc__)
enum target_cpu target_cpu = CPU_POWERPC;
#elif defined(__arm__)
@@ -611,6 +614,10 @@ int main(int argc, char **argv)
signal( SIGTERM, exit_on_signal );
signal( SIGINT, exit_on_signal );
+#ifdef FORCE_POINTER_SIZE
+ force_pointer_size = sizeof(size_t);
+#endif
+
output_file = stdout;
argv = parse_options( argc, argv, spec );
diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c
index 06aa200..c44d2e3 100644
--- a/tools/winegcc/winegcc.c
+++ b/tools/winegcc/winegcc.c
@@ -213,10 +213,13 @@ struct options
strarray* files;
};
+#undef FORCE_POINTER_SIZE
#ifdef __i386__
static const enum target_cpu build_cpu = CPU_x86;
+#define FORCE_POINTER_SIZE
#elif defined(__x86_64__)
static const enum target_cpu build_cpu = CPU_x86_64;
+#define FORCE_POINTER_SIZE
#elif defined(__powerpc__)
static const enum target_cpu build_cpu = CPU_POWERPC;
#elif defined(__arm__)
@@ -1258,6 +1261,9 @@ int main(int argc, char **argv)
opts.linker_args = strarray_alloc();
opts.compiler_args = strarray_alloc();
opts.winebuild_args = strarray_alloc();
+#ifdef FORCE_POINTER_SIZE
+ opts.force_pointer_size = sizeof(size_t);
+#endif
/* determine the processor type */
if (strendswith(argv[0], "winecpp")) opts.processor = proc_cpp;
hardware/emulator/wine/files/wine-1.9.3-gcc-5_3_0-disable-force-alignment.patch
+20
View File
@@ -0,0 +1,20 @@
--- a/include/windef.h 2016-02-09 05:17:54.925574387 +0000
+++ b/include/windef.h 2016-02-09 12:40:25.231866622 +0000
@@ -64,7 +64,7 @@
# error You need to define __stdcall for your compiler
# endif
# elif defined(__x86_64__) && defined (__GNUC__)
-# if (__GNUC__ > 5) || ((__GNUC__ == 5) && (__GNUC_MINOR__ >= 3))
+# if (__GNUC__ > 5)
# define __stdcall __attribute__((ms_abi)) __attribute__((__force_align_arg_pointer__))
# else
# define __stdcall __attribute__((ms_abi))
@@ -82,7 +82,7 @@
# define __cdecl __attribute__((__cdecl__))
# endif
# elif defined(__x86_64__) && defined (__GNUC__)
-# if (__GNUC__ > 5) || ((__GNUC__ == 5) && (__GNUC_MINOR__ >= 3))
+# if (__GNUC__ > 5)
# define __cdecl __attribute__((ms_abi)) __attribute__((__force_align_arg_pointer__))
# else
# define __cdecl __attribute__((ms_abi))
hardware/emulator/wine/pspec.xml
+14 -4
View File
@@ -14,8 +14,6 @@
<Summary>WINE Is Not An Emulator, which lets you run Microsoft Windows applications</Summary>
<Description>Wine allows running Windows 3.*, Windows 95/98 and Windows NT programs on a i386 (or compatible) machine running X11. It is still alpha level code; don't expect everything to work.</Description>
<Archive sha1sum="157efa125c047ac5a2f64f5ef2d26e9592645f82" type="tarbz2">https://dl.winehq.org/wine/source/1.9/wine-1.9.13.tar.bz2</Archive>
<Archive sha1sum="e580c503ca9289f24ee05d249ef1055a09ba1639" type="targz" target="wine-1.9.13">https://github.com/wine-compholio/wine-staging/archive/v1.9.13.tar.gz</Archive>
<BuildDependencies>
<Dependency>lcms2-devel</Dependency>
<Dependency>libao-devel</Dependency>
@@ -65,6 +63,18 @@
<Dependency>util-linux</Dependency>
<Dependency>ncurses-devel</Dependency>
</BuildDependencies>
<Patches>
<!-- patches -->
<Patch level="1">wine-1.9.3-gcc-5_3_0-disable-force-alignment.patch</Patch>
<Patch level="1">gcc_erorr.patch</Patch>
<!-- Use XDG_DOCUMENTS_DIR for "My Documents" -->
<!--Patch level="1">documents-path.patch</Patch>
<Patch level="1">application-pdf.patch</Patch>
<Patch level="1">desktop-file-translation.patch</Patch>
<Patch level="1">fix_rm.patch</Patch-->
</Patches>
</Source>
<Package>
@@ -255,8 +265,8 @@
<Date>2016-07-02</Date>
<Version>1.9.13</Version>
<Comment>First release</Comment>
<Name>Osman Erkan</Name>
<Email>osman.erkan@pisilinux.org</Email>
<Name>Ergün Salman</Name>
<Email>poyraz76@pisilinux.org</Email>
</Update>
</History>
</PISI>
programming/build/ninja/actions.py
+2 -1
View File
@@ -13,6 +13,7 @@ from pisi.actionsapi import get
def build():
shelltools.system("python bootstrap.py")
shelltools.system("asciidoc doc/manual.asciidoc")
shelltools.system("emacs -Q --batch -f batch-byte-compile misc/ninja-mode.el")
def check():
#needs new package gtest -> ignore it for now
@@ -27,4 +28,4 @@ def install():
pisitools.dodoc("HACKING.md", "COPYING", "RELEASING", "README", "doc/manual.asciidoc")
pisitools.dohtml("doc/manual.html")
pisitools.dohtml("doc/manual.html")
programming/build/ninja/pspec.xml
+11 -2
View File
@@ -12,12 +12,14 @@
<IsA>app:console</IsA>
<Summary>Ninja is a small build system with a focus on speed.</Summary>
<Description>Ninja is a small build system with a focus on speed.</Description>
<Archive sha1sum="a6ff055691f6d355234298c21cc18961b4ca2ed9" type="targz">https://github.com/martine/ninja/archive/v1.6.0.tar.gz</Archive>
<Archive sha1sum="556ed5f8ee49753af1cf4b0ab2315d39d1954d58" type="targz">https://github.com/martine/ninja/archive/v1.7.1.tar.gz</Archive>
<BuildDependencies>
<Dependency>re2c</Dependency>
<Dependency>asciidoc</Dependency>
<Dependency>emacs-python</Dependency>
</BuildDependencies>
<Patches>
<Patch>LFS.patch</Patch>
<!-- <Patch>LFS.patch</Patch> -->
</Patches>
</Source>
@@ -34,6 +36,13 @@
</Package>
<History>
<Update release="3">
<Date>2016-07-09</Date>
<Version>1.7.1</Version>
<Comment>Version Bump</Comment>
<Name>Ergün Salman</Name>
<Email>poyraz76@pisilinux.org</Email>
</Update>
<Update release="2">
<Date>2016-06-09</Date>
<Version>1.6.0</Version>