diff options
| author |   Michael Weber <xmw@gentoo.org> | 2012-02-06 02:33:55 +0000 |
|---|---|---|
| committer | Michael Weber <xmw@gentoo.org> | 2012-02-06 02:33:55 +0000 |
| commit | b6a1493bfbc8c2440d601b0579ddb1cfd92d7d24 (patch) | |
| tree | 57dd06d451945ec8a094cf34f0defff41e713342 /media-libs/oyranos/files | |
| parent | Adding ~x86 (diff) | |
| download | gentoo-2-b6a1493bfbc8c2440d601b0579ddb1cfd92d7d24.tar.gz gentoo-2-b6a1493bfbc8c2440d601b0579ddb1cfd92d7d24.tar.bz2 gentoo-2-b6a1493bfbc8c2440d601b0579ddb1cfd92d7d24.zip | |
Initial import from sunrise (bug 287353)
(Portage version: 2.1.10.44/cvs/Linux x86_64)
Diffstat (limited to 'media-libs/oyranos/files')
| -rw-r--r-- | media-libs/oyranos/files/oyranos-0.3.2-buildsystem.patch | 72 |
1 files changed, 72 insertions, 0 deletions
diff --git a/media-libs/oyranos/files/oyranos-0.3.2-buildsystem.patch b/media-libs/oyranos/files/oyranos-0.3.2-buildsystem.patch new file mode 100644 index 000000000000..14272e2515b7 --- /dev/null +++ b/media-libs/oyranos/files/oyranos-0.3.2-buildsystem.patch @@ -0,0 +1,72 @@ +--- oyranos-0.3.2/configure ++++ oyranos-0.3.2/configure +@@ -30,7 +30,7 @@ + PKGC=$TARGET.pc + VERS_H="$TARGET"_version.h + zeile="$0 $@" +-MAKEFILE_DIR=". fl_i18n libXNVCtrl yajl"; export MAKEFILE_DIR ++MAKEFILE_DIR=". fl_i18n libXNVCtrl"; export MAKEFILE_DIR + + if [ `uname` = "Linux" ]; then + v=-v +@@ -68,7 +54,7 @@ + OY_DEVEL_MONTH=05 + OYRANOS_DEVEL_MONTH=5 # numeric + OY_DEVEL_YEAR=2011 +-OY_GIT_MASTER="`cat $ROOT_DIR/.git/refs/heads/master`" ++OY_GIT_MASTER="" + time="`date +%y%m%d.%H%M%S`" + DATE="$OY_START_MONTH $OY_START_YEAR - $OY_DEVEL_MONTH $OY_DEVEL_YEAR" + VERSION=$VERSION_A.$VERSION_B.$VERSION_C +@@ -120,7 +107,7 @@ + fi + IFS=$old_IFS + +-STRIPOPT="sed s/-O.//" ++STRIPOPT="cat" + + if [ $# -gt 0 ]; then + prefix="" +--- oyranos-0.3.2/configure_tests.sh ++++ oyranos-0.3.2/configure_tests.sh +@@ -3,7 +3,7 @@ + set > testset.txt + ERROR=0 + WARNING=0 +-STRIPOPT='s/-O.// ; s/-isysroot [[:graph:]]*// ; s/-arch ppc// ; s/-arch i386//' ++STRIPOPT='s/-isysroot [[:graph:]]*// ; s/-arch ppc// ; s/-arch i386//' + + mkdir -p tests + +--- oyranos-0.3.2/oforms/oyranos_xforms.makefile ++++ oyranos-0.3.2/oforms/oyranos_xforms.makefile +@@ -1,7 +1,8 @@ + INCL = $(INCLUDE) -I../ -I./ $(DEBUG) +-CC = gcc ++CC ?= gcc ++CXX ?= c++ + DEBUG = -Wall -g -O0 +-LDFLAGS_ = $$LDFLAGS -L../fl_i18n ++LDFLAGS += -L../fl_i18n + OY_LIBS := $(shell pkg-config libxml-2.0 --libs --cflags) + OY_FLAGS = -L../ -loyranos -loyranos_object -loyranos_core $(OY_LIBS) + FLTK_FLAGS := $(shell fltk-config --ldflags --cxxflags | sed s/-O2//) -lpthread +@@ -16,15 +17,15 @@ + + oyranos-xforms: $(SRCDIR)oyranos_xforms.c + echo "Compiling $(SRCDIR)$< + Linking $@ ..." +- gcc -Wall -g $(CFLAGS) $(INCL) $(SRCDIR)oyranos_xforms.c -o oyranos-xforms -pedantic $(OY_FLAGS) $(LDFLAGS_) ++ $(CC) -Wall -g $(CFLAGS) $(INCL) $(SRCDIR)oyranos_xforms.c -o oyranos-xforms -pedantic $(OY_FLAGS) $(LDFLAGS) + + oyranos-xforms-modules: $(SRCDIR)oyranos_xforms_modules.c + echo "Compiling $(SRCDIR)$< + Linking $@ ..." +- gcc -Wall -g $(CFLAGS) $(INCL) $< -o $@ -pedantic $(OY_FLAGS) $(LDFLAGS_) ++ $(CC) -Wall -g $(CFLAGS) $(INCL) $< -o $@ -pedantic $(OY_FLAGS) $(LDFLAGS) + + oyranos-xforms-fltk: $(SRCDIR)oyranos_xforms_fltk.cxx $(SRCDIR)oyranos_forms_fltk.cxx $(SRCDIR)oyranos_widgets_fltk.cxx $(SRCDIR)oyranos_widgets_fltk.h + echo "Compiling $(SRCDIR)$< + Linking $@ ..." +- c++ $(LDFLAGS_) -Wall -g $(CXXFLAGS) $(INCL) $(SRCDIR)oyranos_xforms_fltk.cxx -o oyranos-xforms-fltk -pedantic -loyforms_fltk -lfl_i18n $(FLTK_FLAGS) $(OY_FLAGS) ++ $(CXX) $(LDFLAGS) -Wall -g $(CXXFLAGS) $(INCL) $(SRCDIR)oyranos_xforms_fltk.cxx -o oyranos-xforms-fltk -pedantic -loyforms_fltk -lfl_i18n $(FLTK_FLAGS) $(OY_FLAGS) + + + # Build commands and filename extensions... |