haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-05-05 06:28:55 +02:00
Code Issues Packages Projects Releases Wiki Activity

p7zip: fix RAM size detection.

Browse Source 
fixes #100.
This commit is contained in:
Adrien Destugues
2016-02-14 10:21:30 +01:00
parent 9b3bf86b38
commit 9e0f9e1877
3 changed files with 91 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app-arch/p7zip/p7zip-9.20.1.recipe
View File

@@ -8,10 +8,10 @@ SOURCE_URI="http://downloads.sourceforge.net/project/p7zip/p7zip/9.20.1/p7zip_9.
CHECKSUM_SHA256="49557e7ffca08100f9fc687f4dfc5aea703ca207640c76d9dee7b66f03cb4782"
LICENSE="GNU LGPL v2.1"
COPYRIGHT="1999-2011 7-Zip Igor Pavlov."
REVISION="5"
REVISION="6"
ARCHITECTURES="x86_gcc2 x86 x86_64"
PATCHES="p7zip-9.20.1.patch"
PATCHES="p7zip-9.20.1.patchset"
ADDITIONAL_FILES="p7zip-expander-rules"

53
app-arch/p7zip/patches/p7zip-9.20.1.patch
View File

@@ -1,53 +0,0 @@
diff -urN p7zip_9.20.1/CPP/myWindows/config.h p7zip_9.20.1-haiku/CPP/myWindows/config.h
--- p7zip_9.20.1/CPP/myWindows/config.h 2011-01-21 22:24:42.022806528 -0800
+++ p7zip_9.20.1-haiku/CPP/myWindows/config.h 2012-06-13 23:02:29.589824000 -0700
@@ -24,7 +24,7 @@
#endif /* !ENV_MACOSX && !ENV_BEOS */
- #if !defined(ENV_BEOS)
+ #if !defined(ENV_BEOS) && !defined(ENV_HAIKU)
#define ENV_HAVE_GETPASS
#if !defined(sun)
diff -urN p7zip_9.20.1/CPP/Windows/System.cpp p7zip_9.20.1-haiku/CPP/Windows/System.cpp
--- p7zip_9.20.1/CPP/Windows/System.cpp 2009-02-15 01:19:45.023330816 -0800
+++ p7zip_9.20.1-haiku/CPP/Windows/System.cpp 2012-06-13 23:06:28.000786432 -0700
@@ -15,7 +15,7 @@
#include <sys/sysinfo.h>
#endif
-#if defined(ENV_BEOS)
+#if defined(ENV_BEOS) || defined(ENV_HAIKU)
#include <be/kernel/OS.h>
#endif
@@ -79,7 +79,7 @@
if (nbcpu < 1) nbcpu = 1;
return nbcpu;
}
- #elif defined(ENV_BEOS)
+ #elif defined(ENV_BEOS) || defined(ENV_HAIKU)
UInt32 GetNumberOfProcessors() {
system_info info;
get_system_info(&info);
diff -urN p7zip_9.20.1/makefile.haiku p7zip_9.20.1-haiku/makefile.haiku
--- p7zip_9.20.1/makefile.haiku 1969-12-31 16:00:00.000000000 -0800
+++ p7zip_9.20.1-haiku/makefile.haiku 2012-06-13 23:09:01.245628928 -0700
@@ -0,0 +1,16 @@
+OPTFLAGS=-O
+
+ALLFLAGS=${OPTFLAGS} -s \
+ -DENV_HAIKU \
+ -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE \
+ -DNDEBUG -D_REENTRANT -DENV_UNIX \
+ $(LOCAL_FLAGS)
+
+CXX=g++ $(ALLFLAGS)
+CC=gcc $(ALLFLAGS)
+LINK_SHARED=-nostart
+
+LOCAL_LIBS=
+LOCAL_LIBS_DLL=$(LOCAL_LIBS)
+
+OBJ_CRC32=$(OBJ_CRC32_C)

89
app-arch/p7zip/patches/p7zip-9.20.1.patchset Normal file
View File

@@ -0,0 +1,89 @@
From 15a2cc74e7d3ef5b5078cc151918ab59d73c2c17 Mon Sep 17 00:00:00 2001
From: Adrien Destugues <pulkomandy@pulkomandy.tk>
Date: Sun, 14 Feb 2016 10:08:25 +0100
Subject: applying patch p7zip-9.20.1.patch
diff --git a/CPP/Windows/System.cpp b/CPP/Windows/System.cpp
index b63ebec..32d14cd 100644
--- a/CPP/Windows/System.cpp
+++ b/CPP/Windows/System.cpp
@@ -15,7 +15,7 @@
#include <sys/sysinfo.h>
#endif
-#if defined(ENV_BEOS)
+#if defined(ENV_BEOS) || defined(ENV_HAIKU)
#include <be/kernel/OS.h>
#endif
@@ -79,7 +79,7 @@ namespace NWindows
if (nbcpu < 1) nbcpu = 1;
return nbcpu;
}
- #elif defined(ENV_BEOS)
+ #elif defined(ENV_BEOS) || defined(ENV_HAIKU)
UInt32 GetNumberOfProcessors() {
system_info info;
get_system_info(&info);
diff --git a/CPP/myWindows/config.h b/CPP/myWindows/config.h
index 54332aa..be19f17 100644
--- a/CPP/myWindows/config.h
+++ b/CPP/myWindows/config.h
@@ -24,7 +24,7 @@
#endif /* !ENV_MACOSX && !ENV_BEOS */
- #if !defined(ENV_BEOS)
+ #if !defined(ENV_BEOS) && !defined(ENV_HAIKU)
#define ENV_HAVE_GETPASS
#if !defined(sun)
diff --git a/makefile.haiku b/makefile.haiku
new file mode 100644
index 0000000..654e977
--- /dev/null
+++ b/makefile.haiku
@@ -0,0 +1,16 @@
+OPTFLAGS=-O
+
+ALLFLAGS=${OPTFLAGS} -s \
+ -DENV_HAIKU \
+ -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE \
+ -DNDEBUG -D_REENTRANT -DENV_UNIX \
+ $(LOCAL_FLAGS)
+
+CXX=g++ $(ALLFLAGS)
+CC=gcc $(ALLFLAGS)
+LINK_SHARED=-nostart
+
+LOCAL_LIBS=
+LOCAL_LIBS_DLL=$(LOCAL_LIBS)
+
+OBJ_CRC32=$(OBJ_CRC32_C)
--
2.7.0
From e1583ddb02ed9e282869786c51d175bab7e284c3 Mon Sep 17 00:00:00 2001
From: Adrien Destugues <pulkomandy@pulkomandy.tk>
Date: Sun, 14 Feb 2016 10:15:58 +0100
Subject: Fix detection of RAM size.
diff --git a/CPP/Windows/System.cpp b/CPP/Windows/System.cpp
index 32d14cd..8ad7975 100644
--- a/CPP/Windows/System.cpp
+++ b/CPP/Windows/System.cpp
@@ -150,7 +150,7 @@ namespace NWindows
if ( pstat( PSTAT_STATIC, pu, (size_t)sizeof(pst), (size_t)0, 0 ) != -1 ) {
ullTotalPhys = ((UInt64)pst.physical_memory)*pst.page_size;
}
-#elif defined(ENV_BEOS)
+#elif defined(ENV_BEOS) || defined(ENV_HAIKU)
system_info info;
get_system_info(&info);
ullTotalPhys = info.max_pages;
--
2.7.0