dbp/ifolder
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Bump to svn snapshot

Browse Source 
Package-Manager: portage-2.2.0_alpha188
RepoMan-Options: --force
This commit is contained in:
Mario Fetka
2013-11-20 04:52:06 +01:00
parent 8a7f817e37
commit a4a6bb7979
6 changed files with 308 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

84
dev-db/libflaim/files/libflaim-arm.patch Normal file
View File

@@ -0,0 +1,84 @@
Index: Makefile
===================================================================
--- Makefile.orig
+++ Makefile
@@ -462,6 +462,14 @@ ifndef host_native_word_size
endif
ifndef host_native_word_size
+ ifneq (,$(findstring arm,$(HOSTTYPE)))
+ host_processor_family = arm
+ host_native_word_size = 32
+ host_supported_word_sizes = 32
+ endif
+endif
+
+ifndef host_native_word_size
$(error Unable to determine host word size. $(HOSTTYPE))
endif
@@ -1019,7 +1027,9 @@ ifdef unix_target
ifeq ($(compiler),g++)
ccflags += -Wall -fPIC
ifneq ($(target_processor_family),ia64)
- ccflags += -m$(target_word_size)
+ ifneq ($(target_processor_family),arm)
+ ccflags += -m$(target_word_size)
+ endif
endif
endif
@@ -1133,9 +1143,11 @@ ifdef unix_target
ifeq ($(compiler),g++)
ifneq ($(target_processor_family),ia64)
+ ifneq ($(target_processor_family),arm)
shared_link_flags += -m$(target_word_size)
link_flags += -m$(target_word_size)
endif
+ endif
endif
lib_link_libs = -lpthread
Index: src/flaimtk.h
===================================================================
--- src/flaimtk.h.orig
+++ src/flaimtk.h
@@ -54,6 +54,7 @@
#undef FLM_GNUC
#undef FLM_HAS_ASYNC_IO
#undef FLM_HAS_DIRECT_IO
+ #undef FLM_ARM
#if defined( __GNUC__)
#define FLM_GNUC
@@ -149,6 +150,8 @@
#endif
#elif defined( __x86__) || defined( __i386__) || defined( __x86_64__)
#define FLM_X86
+ #elif defined( __arm__) || defined( __thumb__)
+ #define FLM_ARM
#else
#error Platform architecture not supported
#endif
Index: ftk/src/ftk.h
===================================================================
--- ftk/src/ftk.h.orig
+++ ftk/src/ftk.h
@@ -54,6 +54,7 @@
#undef FLM_GNUC
#undef FLM_HAS_ASYNC_IO
#undef FLM_HAS_DIRECT_IO
+ #undef FLM_ARM
#if defined( __GNUC__)
#define FLM_GNUC
@@ -149,6 +150,8 @@
#endif
#elif defined( __x86__) || defined( __i386__) || defined( __x86_64__)
#define FLM_X86
+ #elif defined( __arm__) || defined( __thumb__)
+ #define FLM_ARM
#else
#error Platform architecture not supported
#endif

72
dev-db/libflaim/files/libflaim-hppa.patch Normal file
View File

@@ -0,0 +1,72 @@
--- Makefile.orig 2010-07-06 08:43:35.000000000 +0200
+++ Makefile 2010-07-06 08:45:27.000000000 +0200
@@ -462,6 +462,14 @@
endif
ifndef host_native_word_size
+ ifneq (,$(findstring parisc,$(HOSTTYPE)))
+ host_processor_family = hppa
+ host_native_word_size = 32
+ host_supported_word_sizes = 32
+ endif
+endif
+
+ifndef host_native_word_size
$(error Unable to determine host word size. $(HOSTTYPE))
endif
--- Makefile 2010-07-06 08:53:52.000000000 +0200
+++ Makefile 2010-07-06 08:53:45.000000000 +0200
@@ -1027,7 +1027,9 @@
ifeq ($(compiler),g++)
ccflags += -Wall -Werror -fPIC
ifneq ($(target_processor_family),ia64)
- ccflags += -m$(target_word_size)
+ ifneq ($(HOSTTYPE),parisc)
+ ccflags += -m$(target_word_size)
+ endif
endif
endif
--- src/flaimtk.h.orig 2010-07-06 08:59:48.000000000 +0200
+++ src/flaimtk.h 2010-07-06 09:02:19.000000000 +0200
@@ -54,6 +54,7 @@
#undef FLM_GNUC
#undef FLM_HAS_ASYNC_IO
#undef FLM_HAS_DIRECT_IO
+ #undef FLM_PARISC
#if defined( __GNUC__)
#define FLM_GNUC
@@ -149,6 +150,10 @@
#endif
#elif defined( __x86__) || defined( __i386__) || defined( __x86_64__)
#define FLM_X86
+ #elif defined( __hppa )
+ #define FLM_PARISC
+ #define FLM_BIG_ENDIAN
+ #define FML_STRICT_ALIGNMENT
#else
#error Platform architecture not supported
#endif
--- ftk/src/ftk.h.orig 2010-07-06 09:06:25.000000000 +0200
+++ ftk/src/ftk.h 2010-07-06 09:07:44.000000000 +0200
@@ -54,6 +54,7 @@
#undef FLM_GNUC
#undef FLM_HAS_ASYNC_IO
#undef FLM_HAS_DIRECT_IO
+ #undef FLM_PARISC
#if defined( __GNUC__)
#define FLM_GNUC
@@ -149,6 +150,10 @@
#endif
#elif defined( __x86__) || defined( __i386__) || defined( __x86_64__)
#define FLM_X86
+ #elif defined( __hppa )
+ #define FLM_PARISC
+ #define FLM_BIG_ENDIAN
+ #define FML_STRICT_ALIGNMENT
#else
#error Platform architecture not supported
#endif

96
dev-db/libflaim/files/libflaim-warning.patch Normal file
View File

@@ -0,0 +1,96 @@
Index: ftk/src/ftk.h
===================================================================
--- ftk/src/ftk.h.orig 2007-03-29 16:09:57.000000000 +0200
+++ ftk/src/ftk.h 2011-06-02 15:45:22.283023559 +0200
@@ -330,8 +330,10 @@
#endif
#if defined( FLM_WIN) || defined( FLM_NLM)
+ #define FLMATOMIC_RET long
#define FLMATOMIC volatile long
#else
+ #define FLMATOMIC_RET int
#define FLMATOMIC volatile int
#endif
@@ -3943,7 +3945,7 @@
} F_TMSTAMP;
#define f_timeIsLeapYear(year) \
- ((((year) & 0x03) == 0) && (((year) % 100) != 0) || (((year) % 400) == 0))
+ (((((year) & 0x03) == 0) && (((year) % 100) != 0)) || (((year) % 400) == 0))
void f_timeGetSeconds(
FLMUINT * puiSeconds);
Index: ftk/src/ftksys.h
===================================================================
--- ftk/src/ftksys.h.orig 2007-03-29 16:09:57.000000000 +0200
+++ ftk/src/ftksys.h 2011-06-02 15:45:22.284023465 +0200
@@ -218,7 +218,7 @@
Desc:
**********************************************************************/
#if defined( FLM_PPC) && defined( FLM_GNUC) && defined( FLM_LINUX)
- extern "C" FLMATOMIC ppc_atomic_add(
+ extern "C" FLMATOMIC_RET ppc_atomic_add(
FLMATOMIC * piTarget,
FLMINT32 iDelta);
#endif
@@ -227,7 +227,7 @@
Desc:
**********************************************************************/
#if defined( FLM_PPC) && defined( FLM_GNUC) && defined( FLM_LINUX)
- extern "C" FLMATOMIC ppc_atomic_xchg(
+ extern "C" FLMATOMIC_RET ppc_atomic_xchg(
FLMATOMIC * piTarget,
FLMATOMIC iNewValue);
#endif
Index: ftk/src/ftkunix.cpp
===================================================================
--- ftk/src/ftkunix.cpp.orig 2007-03-29 16:09:57.000000000 +0200
+++ ftk/src/ftkunix.cpp 2011-06-02 15:45:22.284023465 +0200
@@ -1356,7 +1356,7 @@ extern "C" void sparc_atomic_code( void)
Desc:
****************************************************************************/
#if defined( FLM_PPC) && defined( FLM_GNUC)
-FLMATOMIC ppc_atomic_add(
+FLMATOMIC_RET ppc_atomic_add(
FLMATOMIC * piTarget,
FLMINT32 iDelta)
{
@@ -1381,7 +1381,7 @@ FLMATOMIC ppc_atomic_add(
Desc:
****************************************************************************/
#if defined( FLM_PPC) && defined( FLM_GNUC)
-FLMATOMIC ppc_atomic_xchg(
+FLMATOMIC_RET ppc_atomic_xchg(
FLMATOMIC * piTarget,
FLMATOMIC iNewValue)
{
Index: src/kybuild.cpp
===================================================================
--- src/kybuild.cpp.orig 2007-03-29 16:09:57.000000000 +0200
+++ src/kybuild.cpp 2011-06-02 15:45:22.286023277 +0200
@@ -534,8 +534,8 @@ FSTATIC RCODE flmProcessIndexedFld(
if (pIxd->uiFlags & IXD_OFFLINE)
{
if (uiContainerNum > pIxd->uiLastContainerIndexed ||
- uiContainerNum == pIxd->uiLastContainerIndexed &&
- uiDrn > pIxd->uiLastDrnIndexed)
+ ( uiContainerNum == pIxd->uiLastContainerIndexed &&
+ uiDrn > pIxd->uiLastDrnIndexed ) )
{
continue;
}
Index: Makefile
===================================================================
--- Makefile.orig 2007-03-29 16:09:57.000000000 +0200
+++ Makefile 2011-06-02 15:46:24.264179045 +0200
@@ -1017,7 +1017,7 @@ ifdef unix_target
# Compiler defines and flags
ifeq ($(compiler),g++)
- ccflags += -Wall -Werror -fPIC
+ ccflags += -Wall -fPIC
ifneq ($(target_processor_family),ia64)
ccflags += -m$(target_word_size)
endif