mirror of
https://github.com/yann64/haikuports.git
synced 2026-05-04 22:18:55 +02:00
90 lines
2.2 KiB
Plaintext
90 lines
2.2 KiB
Plaintext
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
|
|
|