From 8f16335443a322578274737c8d80ce557e4d2656 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Mon, 12 Aug 2013 10:30:50 +0200 Subject: add xmbc package for raspberry-pi target --- package/tinyxml/patches/patch-Makefile | 61 +++++++++++++++++++++++++++++ package/tinyxml/patches/patch-Makefile.orig | 60 ++++++++++++++++++++++++++++ 2 files changed, 121 insertions(+) create mode 100644 package/tinyxml/patches/patch-Makefile create mode 100644 package/tinyxml/patches/patch-Makefile.orig (limited to 'package/tinyxml/patches') diff --git a/package/tinyxml/patches/patch-Makefile b/package/tinyxml/patches/patch-Makefile new file mode 100644 index 000000000..bfe7abb95 --- /dev/null +++ b/package/tinyxml/patches/patch-Makefile @@ -0,0 +1,61 @@ +--- tinyxml.orig/Makefile 2013-07-30 15:47:47.000000000 +0200 ++++ tinyxml/Makefile 2013-07-30 15:47:46.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} +@@ -102,7 +102,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 diff --git a/package/tinyxml/patches/patch-Makefile.orig b/package/tinyxml/patches/patch-Makefile.orig new file mode 100644 index 000000000..78372e7e5 --- /dev/null +++ b/package/tinyxml/patches/patch-Makefile.orig @@ -0,0 +1,60 @@ +--- 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 -- cgit v1.2.3