* [gentoo-commits] gentoo-x86 commit in media-libs/oyranos/files: oyranos-0.3.2-buildsystem.patch
@ 2012-02-06 2:33 Michael Weber (xmw)
0 siblings, 0 replies; 2+ messages in thread
From: Michael Weber (xmw) @ 2012-02-06 2:33 UTC (permalink / raw
To: gentoo-commits
xmw 12/02/06 02:33:55
Added: oyranos-0.3.2-buildsystem.patch
Log:
Initial import from sunrise (bug 287353)
(Portage version: 2.1.10.44/cvs/Linux x86_64)
Revision Changes Path
1.1 media-libs/oyranos/files/oyranos-0.3.2-buildsystem.patch
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/oyranos/files/oyranos-0.3.2-buildsystem.patch?rev=1.1&view=markup
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
Index: oyranos-0.3.2-buildsystem.patch
===================================================================
--- 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...
^ permalink raw reply [flat|nested] 2+ messages in thread
* [gentoo-commits] gentoo-x86 commit in media-libs/oyranos/files: oyranos-0.3.2-buildsystem.patch
@ 2012-11-04 11:26 Michael Weber (xmw)
0 siblings, 0 replies; 2+ messages in thread
From: Michael Weber (xmw) @ 2012-11-04 11:26 UTC (permalink / raw
To: gentoo-commits
xmw 12/11/04 11:26:02
Removed: oyranos-0.3.2-buildsystem.patch
Log:
Revbump to adapt to new elektra include names, drop old.
(Portage version: 2.1.11.31/cvs/Linux x86_64, signed Manifest commit with key 62EEF090)
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2012-11-04 11:26 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-11-04 11:26 [gentoo-commits] gentoo-x86 commit in media-libs/oyranos/files: oyranos-0.3.2-buildsystem.patch Michael Weber (xmw)
-- strict thread matches above, loose matches on Subject: below --
2012-02-06 2:33 Michael Weber (xmw)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox