| 1 |
xmw 12/02/06 02:33:55 |
| 2 |
|
| 3 |
Added: oyranos-0.3.2-buildsystem.patch |
| 4 |
Log: |
| 5 |
Initial import from sunrise (bug 287353) |
| 6 |
|
| 7 |
(Portage version: 2.1.10.44/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 media-libs/oyranos/files/oyranos-0.3.2-buildsystem.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/oyranos/files/oyranos-0.3.2-buildsystem.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/oyranos/files/oyranos-0.3.2-buildsystem.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: oyranos-0.3.2-buildsystem.patch |
| 16 |
=================================================================== |
| 17 |
--- oyranos-0.3.2/configure |
| 18 |
+++ oyranos-0.3.2/configure |
| 19 |
@@ -30,7 +30,7 @@ |
| 20 |
PKGC=$TARGET.pc |
| 21 |
VERS_H="$TARGET"_version.h |
| 22 |
zeile="$0 $@" |
| 23 |
-MAKEFILE_DIR=". fl_i18n libXNVCtrl yajl"; export MAKEFILE_DIR |
| 24 |
+MAKEFILE_DIR=". fl_i18n libXNVCtrl"; export MAKEFILE_DIR |
| 25 |
|
| 26 |
if [ `uname` = "Linux" ]; then |
| 27 |
v=-v |
| 28 |
@@ -68,7 +54,7 @@ |
| 29 |
OY_DEVEL_MONTH=05 |
| 30 |
OYRANOS_DEVEL_MONTH=5 # numeric |
| 31 |
OY_DEVEL_YEAR=2011 |
| 32 |
-OY_GIT_MASTER="`cat $ROOT_DIR/.git/refs/heads/master`" |
| 33 |
+OY_GIT_MASTER="" |
| 34 |
time="`date +%y%m%d.%H%M%S`" |
| 35 |
DATE="$OY_START_MONTH $OY_START_YEAR - $OY_DEVEL_MONTH $OY_DEVEL_YEAR" |
| 36 |
VERSION=$VERSION_A.$VERSION_B.$VERSION_C |
| 37 |
@@ -120,7 +107,7 @@ |
| 38 |
fi |
| 39 |
IFS=$old_IFS |
| 40 |
|
| 41 |
-STRIPOPT="sed s/-O.//" |
| 42 |
+STRIPOPT="cat" |
| 43 |
|
| 44 |
if [ $# -gt 0 ]; then |
| 45 |
prefix="" |
| 46 |
--- oyranos-0.3.2/configure_tests.sh |
| 47 |
+++ oyranos-0.3.2/configure_tests.sh |
| 48 |
@@ -3,7 +3,7 @@ |
| 49 |
set > testset.txt |
| 50 |
ERROR=0 |
| 51 |
WARNING=0 |
| 52 |
-STRIPOPT='s/-O.// ; s/-isysroot [[:graph:]]*// ; s/-arch ppc// ; s/-arch i386//' |
| 53 |
+STRIPOPT='s/-isysroot [[:graph:]]*// ; s/-arch ppc// ; s/-arch i386//' |
| 54 |
|
| 55 |
mkdir -p tests |
| 56 |
|
| 57 |
--- oyranos-0.3.2/oforms/oyranos_xforms.makefile |
| 58 |
+++ oyranos-0.3.2/oforms/oyranos_xforms.makefile |
| 59 |
@@ -1,7 +1,8 @@ |
| 60 |
INCL = $(INCLUDE) -I../ -I./ $(DEBUG) |
| 61 |
-CC = gcc |
| 62 |
+CC ?= gcc |
| 63 |
+CXX ?= c++ |
| 64 |
DEBUG = -Wall -g -O0 |
| 65 |
-LDFLAGS_ = $$LDFLAGS -L../fl_i18n |
| 66 |
+LDFLAGS += -L../fl_i18n |
| 67 |
OY_LIBS := $(shell pkg-config libxml-2.0 --libs --cflags) |
| 68 |
OY_FLAGS = -L../ -loyranos -loyranos_object -loyranos_core $(OY_LIBS) |
| 69 |
FLTK_FLAGS := $(shell fltk-config --ldflags --cxxflags | sed s/-O2//) -lpthread |
| 70 |
@@ -16,15 +17,15 @@ |
| 71 |
|
| 72 |
oyranos-xforms: $(SRCDIR)oyranos_xforms.c |
| 73 |
echo "Compiling $(SRCDIR)$< + Linking $@ ..." |
| 74 |
- gcc -Wall -g $(CFLAGS) $(INCL) $(SRCDIR)oyranos_xforms.c -o oyranos-xforms -pedantic $(OY_FLAGS) $(LDFLAGS_) |
| 75 |
+ $(CC) -Wall -g $(CFLAGS) $(INCL) $(SRCDIR)oyranos_xforms.c -o oyranos-xforms -pedantic $(OY_FLAGS) $(LDFLAGS) |
| 76 |
|
| 77 |
oyranos-xforms-modules: $(SRCDIR)oyranos_xforms_modules.c |
| 78 |
echo "Compiling $(SRCDIR)$< + Linking $@ ..." |
| 79 |
- gcc -Wall -g $(CFLAGS) $(INCL) $< -o $@ -pedantic $(OY_FLAGS) $(LDFLAGS_) |
| 80 |
+ $(CC) -Wall -g $(CFLAGS) $(INCL) $< -o $@ -pedantic $(OY_FLAGS) $(LDFLAGS) |
| 81 |
|
| 82 |
oyranos-xforms-fltk: $(SRCDIR)oyranos_xforms_fltk.cxx $(SRCDIR)oyranos_forms_fltk.cxx $(SRCDIR)oyranos_widgets_fltk.cxx $(SRCDIR)oyranos_widgets_fltk.h |
| 83 |
echo "Compiling $(SRCDIR)$< + Linking $@ ..." |
| 84 |
- c++ $(LDFLAGS_) -Wall -g $(CXXFLAGS) $(INCL) $(SRCDIR)oyranos_xforms_fltk.cxx -o oyranos-xforms-fltk -pedantic -loyforms_fltk -lfl_i18n $(FLTK_FLAGS) $(OY_FLAGS) |
| 85 |
+ $(CXX) $(LDFLAGS) -Wall -g $(CXXFLAGS) $(INCL) $(SRCDIR)oyranos_xforms_fltk.cxx -o oyranos-xforms-fltk -pedantic -loyforms_fltk -lfl_i18n $(FLTK_FLAGS) $(OY_FLAGS) |
| 86 |
|
| 87 |
|
| 88 |
# Build commands and filename extensions... |
Archives