dev-db/libflaim: Stable from Debian orig.tar.gz

git-svn-id: https://svn.disconnected-by-peer.at/svn/linamh/trunk/ifolder@1630 6952d904-891a-0410-993b-d76249ca496b
2009-12-05 12:58:32 +00:00
parent 3678af3dd7
commit 66b1828073
7 changed files with 105 additions and 4 deletions
--- a/dev-db/libflaim/files/do-not-compile-with-werror.patch
+++ b/dev-db/libflaim/files/do-not-compile-with-werror.patch
@@ -0,0 +1,19 @@
+--- Makefile.orig	2008-06-01 09:47:35.000000000 +0300
+++ Makefile	2008-06-01 09:50:57.000000000 +0300
+@@ -1009,7 +1009,7 @@
+ 	# 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
+@@ -1888,7 +1888,6 @@
+ 	cd $(lib_install_dir); ln -fs $(lib_prefix)$(project_name).so.$(so_current).$(so_revision) $(lib_prefix)$(project_name).so.$(so_current) 
+ endif
+ 	cd $(lib_install_dir); ln -fs $(lib_prefix)$(project_name).so.$(so_current) $(lib_prefix)$(project_name).so
+-	-ldconfig $(lib_install_dir)
+ 	$(ec)$(gprintf) "Installation complete.\n"
+ endif
+ 
--- a/dev-db/libflaim/files/fortify-source.patch
+++ b/dev-db/libflaim/files/fortify-source.patch
@@ -0,0 +1,46 @@
+--- util/sharutil.h.orig	2008-03-24 19:52:35.000000000 +0000
+++ util/sharutil.h	2008-03-24 19:55:49.000000000 +0000
+@@ -28,6 +28,9 @@
+ 
+ #include "flaim.h"
+ 
+#include <stdio.h>
+#include <string.h>
+
+ #if defined( FLM_WIN)
+ 	// Conversion from XXX to YYY, possible loss of data
+ 	#pragma warning( disable : 4244) 
+--- util/dbshell.h.orig	2008-03-24 19:54:09.000000000 +0000
+++ util/dbshell.h	2008-03-24 19:56:13.000000000 +0000
+@@ -30,6 +30,9 @@
+ #include "flaimsys.h"
+ #include "sharutil.h"
+ 
+#include <stdio.h>
+#include <string.h>
+
+ // Types of clipboard data
+ 
+ enum eClipboardDataType
+--- util/flmunittest.h.orig	2008-03-24 19:56:35.000000000 +0000
+++ util/flmunittest.h	2008-03-24 19:58:21.000000000 +0000
+@@ -29,6 +29,7 @@
+ #include "flaimsys.h"
+ #ifndef FLM_NLM
+ 	#include <stdio.h>
+	#include <string.h>
+ #endif
+ 
+ // Status codes passed to recordUnitTestResults
+--- ftk/src/ftk.h.orig	2008-03-24 19:39:41.000000000 +0000
+++ ftk/src/ftk.h	2008-03-24 19:55:06.000000000 +0000
+@@ -28,6 +28,9 @@
+ #ifndef FTK_H
+ #define FTK_H
+ 
+#include <stdio.h>
+#include <string.h>
+
+ 	/// \defgroup retcodes Return Codes
+ 	
+ 	#ifndef FLM_PLATFORM_CONFIGURED
--- a/dev-db/libflaim/files/libflaim-4.9.1052-optflags.patch
+++ b/dev-db/libflaim/files/libflaim-4.9.1052-optflags.patch
@@ -0,0 +1,12 @@
+diff -up libflaim-4.9.1052/flaim/Makefile~ libflaim-4.9.1052/flaim/Makefile
+--- libflaim-4.9.1052/flaim/Makefile~	2007-09-06 18:13:15.000000000 +0300
+++ libflaim-4.9.1052/flaim/Makefile	2009-05-10 17:09:08.000000000 +0300
+@@ -962,7 +962,7 @@ ifdef unix_target
+ 	endif
+ 
+ 	gcc_optimization_flags = \
+-		-O \
+		$(CXXFLAGS) \
+ 		-foptimize-sibling-calls \
+ 		-fstrength-reduce -fcse-follow-jumps \
+ 		-fcse-skip-blocks \
--- a/dev-db/libflaim/files/libflaim-fortify.patch
+++ b/dev-db/libflaim/files/libflaim-fortify.patch
@@ -0,0 +1,11 @@
+--- libflaim-4.9.966.orig/Makefile
+++ libflaim-4.9.966/Makefile
+@@ -935,7 +935,7 @@
+ 	static_lib_suffix = .a
+ 	shared_lib_suffix = .so.$(shared_lib_version)
+ 	
+-	compiler = g++
+	compiler = g++ -U_FORTIFY_SOURCE -fPIC
+ 	exe_linker = g++
+ 	shared_linker = g++
+