From a4277731ee406bb817c796593644d469c3445a74 Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Sun, 8 Jun 2014 18:41:30 +0200 Subject: package/trace-cmd: bump to version 2.3.2 The first patch "use-pkg-config-instead-of-python-config" has been applied upstream. The flag _GNU_SOURCE is now always defined in Makefile, so it can be removed from trace-cmd.mk CPPFLAGS are appended to CFLAGS and are used to add extra flags, but the flag _LARGEFILE64_SOURCE in TARGET_CPPFLAGS is already defined in source files, which causes a build error. As for CFLAGS, we fix this by filtering out our definition of _LARGEFILE64_SOURCE from the CPPFLAGS before passing them to the trace-cmd Makefile. Signed-off-by: Romain Naour Signed-off-by: Thomas Petazzoni --- ...e-use-pkg-config-instead-of-python-config.patch | 43 ---------------------- 1 file changed, 43 deletions(-) delete mode 100644 package/trace-cmd/trace-cmd-0001-Makefile-use-pkg-config-instead-of-python-config.patch (limited to 'package/trace-cmd/trace-cmd-0001-Makefile-use-pkg-config-instead-of-python-config.patch') diff --git a/package/trace-cmd/trace-cmd-0001-Makefile-use-pkg-config-instead-of-python-config.patch b/package/trace-cmd/trace-cmd-0001-Makefile-use-pkg-config-instead-of-python-config.patch deleted file mode 100644 index 6fed42c41b..0000000000 --- a/package/trace-cmd/trace-cmd-0001-Makefile-use-pkg-config-instead-of-python-config.patch +++ /dev/null @@ -1,43 +0,0 @@ - -trace-cmd use python-config to find out which headers -and libraries should be used to link against the Python libraries. -By default, python-config returns paths that are inappropriate for -cross-compilation. - -Add PYTHON_VERS to build trace-cmd with python2 or python3 - -Signed-off-by: Romain Naour ---- - Makefile | 8 +++++--- - 1 file changed, 5 insertions(+), 3 deletions(-) - -diff --git a/Makefile b/Makefile -index 83329ca..23b70d8 100644 ---- a/Makefile -+++ b/Makefile -@@ -80,8 +80,10 @@ ifndef NO_PYTHON - PYTHON := ctracecmd.so - PYTHON_GUI := ctracecmd.so ctracecmdgui.so - -+PYTHON_VERS ?= python -+ - # Can build python? --ifeq ($(shell sh -c "python-config --includes > /dev/null 2>&1 && echo y"), y) -+ifeq ($(shell sh -c "pkg-config --cflags $(PYTHON_VERS) > /dev/null 2>&1 && echo y"), y) - PYTHON_PLUGINS := plugin_python.so - BUILD_PYTHON := $(PYTHON) $(PYTHON_PLUGINS) - PYTHON_SO_INSTALL := ctracecmd.install -@@ -546,8 +548,8 @@ clean: - - ##### PYTHON STUFF ##### - --PYTHON_INCLUDES = `python-config --includes` --PYTHON_LDFLAGS = `python-config --ldflags` \ -+PYTHON_INCLUDES = `pkg-config --cflags $(PYTHON_VERS)` -+PYTHON_LDFLAGS = `pkg-config --libs $(PYTHON_VERS)` \ - $(shell python -c "import distutils.sysconfig; print distutils.sysconfig.get_config_var('LINKFORSHARED')") - PYGTK_CFLAGS = `pkg-config --cflags pygtk-2.0` - --- -1.8.4 - -- cgit v1.2.3