wok-6.x view freeimage/stuff/gcc4.5_ln.patch @ rev 24142
linux-aufs: git checkout problem ?
| author | Pascal Bellard <pascal.bellard@slitaz.org> |
|---|---|
| date | Mon Nov 15 08:46:59 2021 +0000 (2021-11-15) |
| parents | |
| children |
line source
1 diff -Naur FreeImage.orig//Makefile.fip FreeImage.new//Makefile.fip
2 --- FreeImage.orig//Makefile.fip 2010-08-10 19:15:20.000000000 +0200
3 +++ FreeImage.new//Makefile.fip 2010-09-12 23:29:36.000000000 +0200
4 @@ -15,9 +15,9 @@
6 MODULES = $(SRCS:.c=.o)
7 MODULES := $(MODULES:.cpp=.o)
8 -CFLAGS ?= -O3 -fPIC -fexceptions -fvisibility=hidden -DNO_LCMS
9 +CFLAGS += -O3 -fPIC -fexceptions -fvisibility=hidden -DNO_LCMS
10 CFLAGS += $(INCLUDE)
11 -CXXFLAGS ?= -O3 -fPIC -fexceptions -fvisibility=hidden -Wno-ctor-dtor-privacy
12 +CXXFLAGS += -O3 -fPIC -fexceptions -fvisibility=hidden -Wno-ctor-dtor-privacy
13 CXXFLAGS += $(INCLUDE)
15 ifeq ($(shell sh -c 'uname -m 2>/dev/null || echo not'),x86_64)
16 diff -Naur FreeImage.orig//Makefile.gnu FreeImage.new//Makefile.gnu
17 --- FreeImage.orig//Makefile.gnu 2010-08-10 19:15:20.000000000 +0200
18 +++ FreeImage.new//Makefile.gnu 2010-09-12 23:01:57.000000000 +0200
19 @@ -15,9 +15,9 @@
21 MODULES = $(SRCS:.c=.o)
22 MODULES := $(MODULES:.cpp=.o)
23 -CFLAGS ?= -O3 -fPIC -fexceptions -fvisibility=hidden -DNO_LCMS
24 +CFLAGS += -O3 -fPIC -fexceptions -fvisibility=hidden -DNO_LCMS
25 CFLAGS += $(INCLUDE)
26 -CXXFLAGS ?= -O3 -fPIC -fexceptions -fvisibility=hidden -Wno-ctor-dtor-privacy
27 +CXXFLAGS += -O3 -fPIC -fexceptions -fvisibility=hidden -Wno-ctor-dtor-privacy
28 CXXFLAGS += $(INCLUDE)
30 ifeq ($(shell sh -c 'uname -m 2>/dev/null || echo not'),x86_64)
31 @@ -65,9 +65,6 @@
32 install -m 644 -o root -g root $(HEADER) $(INCDIR)
33 install -m 644 -o root -g root $(STATICLIB) $(INSTALLDIR)
34 install -m 755 -o root -g root $(SHAREDLIB) $(INSTALLDIR)
35 - ln -sf $(SHAREDLIB) $(INSTALLDIR)/$(VERLIBNAME)
36 - ln -sf $(VERLIBNAME) $(INSTALLDIR)/$(LIBNAME)
37 - ldconfig
39 clean:
40 rm -f core Dist/*.* u2dtmp* $(MODULES) $(STATICLIB) $(SHAREDLIB) $(LIBNAME)
41 diff -Naur FreeImage.orig//Source/FreeImageToolkit/Background.cpp FreeImage.new//Source/FreeImageToolkit/Background.cpp
42 --- FreeImage.orig//Source/FreeImageToolkit/Background.cpp 2010-08-10 19:15:20.000000000 +0200
43 +++ FreeImage.new//Source/FreeImageToolkit/Background.cpp 2010-08-10 19:16:12.000000000 +0200
44 @@ -21,6 +21,7 @@
46 #include "FreeImage.h"
47 #include "Utilities.h"
48 +#include <limits.h>
50 /** @brief Determines, whether a palletized image is visually greyscale or not.
52 diff -Naur FreeImage.orig//Source/OpenEXR/Imath/ImathMatrix.h FreeImage.new//Source/OpenEXR/Imath/ImathMatrix.h
53 --- FreeImage.orig//Source/OpenEXR/Imath/ImathMatrix.h 2010-08-10 19:15:20.000000000 +0200
54 +++ FreeImage.new//Source/OpenEXR/Imath/ImathMatrix.h 2010-08-10 21:43:26.000000000 +0200
55 @@ -51,6 +51,7 @@
57 #include <iostream>
58 #include <iomanip>
59 +#include <cstring>
61 #if (defined _WIN32 || defined _WIN64) && defined _MSC_VER
62 // suppress exception specification warnings