diff options
| author | tnut <tnut at nutyx dot com> | 2011-10-15 16:53:57 +0200 |
|---|---|---|
| committer | tnut <tnut at nutyx dot com> | 2011-10-15 16:53:57 +0200 |
| commit | efd29d29185744af93578aac4a6bff45208af852 (patch) | |
| tree | bead6f14a56d3a28ad630888882e4934c0dc70e7 /extra/openjpeg/30_fix_build_for_debian.dpatch | |
| parent | 0441d0e19bf2cbddadcb9fedf21d28d3e6ca4060 (diff) | |
| download | nutyx-pakxe-efd29d29185744af93578aac4a6bff45208af852.tar.gz nutyx-pakxe-efd29d29185744af93578aac4a6bff45208af852.tar.bz2 nutyx-pakxe-efd29d29185744af93578aac4a6bff45208af852.tar.xz nutyx-pakxe-efd29d29185744af93578aac4a6bff45208af852.zip | |
openjpeg dans extra
Diffstat (limited to 'extra/openjpeg/30_fix_build_for_debian.dpatch')
| -rw-r--r-- | extra/openjpeg/30_fix_build_for_debian.dpatch | 70 |
1 files changed, 70 insertions, 0 deletions
diff --git a/extra/openjpeg/30_fix_build_for_debian.dpatch b/extra/openjpeg/30_fix_build_for_debian.dpatch new file mode 100644 index 000000000..afd995054 --- /dev/null +++ b/extra/openjpeg/30_fix_build_for_debian.dpatch @@ -0,0 +1,70 @@ + +#! /bin/sh /usr/share/dpatch/dpatch-run +## 30_fix_build_for_debian.dpatch by <robin.cornelius@gmail.com> +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Dont apply the -s strip flag to the shared lib debian will do it for us +## DP: where necessary +## DP: Remove unnecessary linkage on lstdc++ and lm and add missing linkage for -lm + +@DPATCH@ + +Index: ./Makefile +=================================================================== +--- ./Makefile (revision 96) ++++ ./Makefile (working copy) +@@ -18,8 +18,7 @@ + # Converts cr/lf to just lf + DOS2UNIX = dos2unix + +-COMPILERFLAGS = -Wall -O3 -ffast-math -std=c99 -fPIC +-LIBRARIES = -lstdc++ ++COMPILERFLAGS = -Wall -O3 -ffast-math -std=c99 -fPIC -g $(EXTRA_CFLAGS) + + MODULES = $(SRCS:.c=.o) + CFLAGS = $(COMPILERFLAGS) $(INCLUDE) +@@ -54,7 +53,7 @@ + $(AR) r $@ $(MODULES) + + $(SHAREDLIB): $(MODULES) +- $(CC) -s -shared -Wl,-soname,$(LIBNAME) -o $@ $(MODULES) $(LIBRARIES) ++ $(CC) -shared -Wl,-soname,$(LIBNAME) -o $@ $(MODULES) -lm + + install: OpenJPEG + install -d '$(DESTDIR)$(INSTALL_LIBDIR)' '$(DESTDIR)$(INSTALL_INCLUDE)' + +Index: ./indexer_JPIP/Makefile +=================================================================== +--- ./indexer_JPIP/Makefile (revision 95) ++++ ./indexer_JPIP/Makefile (working copy) +@@ -1,7 +1,6 @@ + CC = gcc + +-LDFLAGS = -lm +-CFLAGS = -Wall ++CFLAGS = -Wall $(EXTRA_CFLAGS) + + all: index_create + +Index: ./codec/Makefile +=================================================================== +--- ./codec/Makefile (revision 96) ++++ ./codec/Makefile (working copy) +@@ -1,13 +1,13 @@ + # Makefile for the main OpenJPEG codecs: j2k_to_image and image_to_j2k + +-CFLAGS = -O3 -lstdc++ # -g -p -pg ++CFLAGS = $(EXTRA_CFLAGS) # -g -p -pg + + all: j2k_to_image image_to_j2k + +-j2k_to_image: j2k_to_image.c ../libopenjpeg.a ++j2k_to_image: j2k_to_image.c + gcc $(CFLAGS) compat/getopt.c index.c convert.c j2k_to_image.c -o j2k_to_image -L.. -lopenjpeg -I ../libopenjpeg/ -lm -ltiff + +-image_to_j2k: image_to_j2k.c ../libopenjpeg.a ++image_to_j2k: image_to_j2k.c + gcc $(CFLAGS) compat/getopt.c index.c convert.c image_to_j2k.c -o image_to_j2k -L.. -lopenjpeg -I ../libopenjpeg/ -lm -ltiff + + clean: + |