diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2013-12-15 14:12:00 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2013-12-15 14:12:00 +0100 |
| commit | 24db4fb9b27f4ea87b3ecdf8fd4dd07b62ba9514 (patch) | |
| tree | cec2d85b768a617ae371837eec7069e7f155e568 /package/tinyxml/patches | |
| parent | f377248abda877e2a945f4152e3e57bbaaeec1ca (diff) | |
| parent | 7260a427d88f1cbfcd8534c5f7805b4b56efb544 (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'package/tinyxml/patches')
| -rw-r--r-- | package/tinyxml/patches/patch-Makefile.orig | 60 |
1 files changed, 0 insertions, 60 deletions
diff --git a/package/tinyxml/patches/patch-Makefile.orig b/package/tinyxml/patches/patch-Makefile.orig deleted file mode 100644 index 78372e7e5..000000000 --- a/package/tinyxml/patches/patch-Makefile.orig +++ /dev/null @@ -1,60 +0,0 @@ ---- tinyxml.orig/Makefile 2013-07-30 15:47:27.000000000 +0200 -+++ tinyxml/Makefile 2013-07-30 15:47:25.000000000 +0200 -@@ -15,13 +15,13 @@ PROFILE := NO - - # TINYXML_USE_STL can be used to turn on STL support. NO, then STL - # will not be used. YES will include the STL files. --TINYXML_USE_STL := NO -+TINYXML_USE_STL := YES - - #**************************************************************************** - --CC := gcc --CXX := g++ --LD := g++ -+CC ?= gcc -+CXX ?= g++ -+LD := $(CXX) - AR := ar rc - RANLIB := ranlib - -@@ -41,9 +41,9 @@ ifeq (YES, ${DEBUG}) - CXXFLAGS := ${DEBUG_CXXFLAGS} - LDFLAGS := ${DEBUG_LDFLAGS} - else -- CFLAGS := ${RELEASE_CFLAGS} -- CXXFLAGS := ${RELEASE_CXXFLAGS} -- LDFLAGS := ${RELEASE_LDFLAGS} -+ CFLAGS ?= ${RELEASE_CFLAGS} -+ CXXFLAGS ?= ${RELEASE_CXXFLAGS} -+ LDFLAGS ?= ${RELEASE_LDFLAGS} - endif - - ifeq (YES, ${PROFILE}) -@@ -81,7 +81,7 @@ CXXFLAGS := ${CXXFLAGS} ${DEFS} - # Targets of the build - #**************************************************************************** - --OUTPUT := xmltest -+OUTPUT := libtinyxml.so.2.6.2 - - all: ${OUTPUT} - -@@ -90,7 +90,7 @@ all: ${OUTPUT} - # Source files - #**************************************************************************** - --SRCS := tinyxml.cpp tinyxmlparser.cpp xmltest.cpp tinyxmlerror.cpp tinystr.cpp -+SRCS := tinyxml.cpp tinyxmlparser.cpp tinyxmlerror.cpp tinystr.cpp - - # Add on the sources for libraries - SRCS := ${SRCS} -@@ -103,6 +103,8 @@ OBJS := $(addsuffix .o,$(basename ${SRCS - - ${OUTPUT}: ${OBJS} - ${LD} -o $@ ${LDFLAGS} ${OBJS} ${LIBS} ${EXTRA_LIBS} -+ ${CXX} -shared -Wl,-soname,libtinyxml.so.2.6.2 -o $@ ${OBJS} ${LDFLAGS} ${LIBS} ${EXTRA_LIBS} -+ ln -sf libtinyxml.so.2.6.2 libtinyxml.so - - #**************************************************************************** - # common rules |