|
|
504f18 |
From: Jan Engelhardt <jengelh@inai.de>
|
|
|
504f18 |
Date: 2022-12-03 14:04:21.501944293 +0100
|
|
|
504f18 |
References: https://lists.opensuse.org/archives/list/factory@lists.opensuse.org/thread/FPNDORIL6NDJD3HFQ76LQBIRBCWVG6TV/
|
|
|
504f18 |
Upstream: no
|
|
|
504f18 |
|
|
|
504f18 |
Mark a few vars as := in the hope to the cut the number of recursive
|
|
|
504f18 |
pkg-config calls at least by some amount. It's not a panacea,
|
|
|
504f18 |
you really must split the "configure" and the "build" steps
|
|
|
504f18 |
and not conflate them together. Use autotools/cmake/meson/whatever.
|
|
|
504f18 |
Not this.
|
|
|
504f18 |
|
|
|
504f18 |
---
|
|
|
504f18 |
Makefile | 30 +++++++++++++++---------------
|
|
|
504f18 |
1 file changed, 15 insertions(+), 15 deletions(-)
|
|
|
504f18 |
|
|
|
504f18 |
Index: trace-cmd-libtracecmd-1.2.0/Makefile
|
|
|
504f18 |
===================================================================
|
|
|
504f18 |
--- trace-cmd-libtracecmd-1.2.0.orig/Makefile
|
|
|
504f18 |
+++ trace-cmd-libtracecmd-1.2.0/Makefile
|
|
|
504f18 |
@@ -221,8 +221,8 @@ LIBS ?= -ldl
|
|
|
504f18 |
LIBTRACECMD_DIR = $(obj)/lib/trace-cmd
|
|
|
504f18 |
LIBTRACECMD_STATIC = $(LIBTRACECMD_DIR)/libtracecmd.a
|
|
|
504f18 |
LIBTRACECMD_SHARED = $(LIBTRACECMD_DIR)/libtracecmd.so.$(LIBTRACECMD_VERSION)
|
|
|
504f18 |
-LIBTRACECMD_SHARED_VERSION = $(shell echo $(LIBTRACECMD_SHARED) | sed -e 's/\(\.so\.[0-9]*\).*/\1/')
|
|
|
504f18 |
-LIBTRACECMD_SHARED_SO = $(shell echo $(LIBTRACECMD_SHARED) | sed -e 's/\(\.so\).*/\1/')
|
|
|
504f18 |
+LIBTRACECMD_SHARED_VERSION := $(shell echo $(LIBTRACECMD_SHARED) | sed -e 's/\(\.so\.[0-9]*\).*/\1/')
|
|
|
504f18 |
+LIBTRACECMD_SHARED_SO := $(shell echo $(LIBTRACECMD_SHARED) | sed -e 's/\(\.so\).*/\1/')
|
|
|
504f18 |
|
|
|
504f18 |
export LIBTRACECMD_STATIC LIBTRACECMD_SHARED
|
|
|
504f18 |
export LIBTRACECMD_SHARED_VERSION LIBTRACECMD_SHARED_SO
|
|
|
504f18 |
@@ -230,12 +230,12 @@ export LIBTRACECMD_SHARED_VERSION LIBTRA
|
|
|
504f18 |
LIBTRACEEVENT=libtraceevent
|
|
|
504f18 |
LIBTRACEFS=libtracefs
|
|
|
504f18 |
|
|
|
504f18 |
-TEST_LIBTRACEEVENT = $(shell sh -c "$(PKG_CONFIG) --atleast-version $(LIBTRACEEVENT_MIN_VERSION) $(LIBTRACEEVENT) > /dev/null 2>&1 && echo y")
|
|
|
504f18 |
-TEST_LIBTRACEFS = $(shell sh -c "$(PKG_CONFIG) --atleast-version $(LIBTRACEFS_MIN_VERSION) $(LIBTRACEFS) > /dev/null 2>&1 && echo y")
|
|
|
504f18 |
+TEST_LIBTRACEEVENT := $(shell sh -c "$(PKG_CONFIG) --atleast-version $(LIBTRACEEVENT_MIN_VERSION) $(LIBTRACEEVENT) > /dev/null 2>&1 && echo y")
|
|
|
504f18 |
+TEST_LIBTRACEFS := $(shell sh -c "$(PKG_CONFIG) --atleast-version $(LIBTRACEFS_MIN_VERSION) $(LIBTRACEFS) > /dev/null 2>&1 && echo y")
|
|
|
504f18 |
|
|
|
504f18 |
ifeq ("$(TEST_LIBTRACEEVENT)", "y")
|
|
|
504f18 |
-LIBTRACEEVENT_CFLAGS = $(shell sh -c "$(PKG_CONFIG) --cflags $(LIBTRACEEVENT)")
|
|
|
504f18 |
-LIBTRACEEVENT_LDLAGS = $(shell sh -c "$(PKG_CONFIG) --libs $(LIBTRACEEVENT)")
|
|
|
504f18 |
+LIBTRACEEVENT_CFLAGS := $(shell sh -c "$(PKG_CONFIG) --cflags $(LIBTRACEEVENT)")
|
|
|
504f18 |
+LIBTRACEEVENT_LDLAGS := $(shell sh -c "$(PKG_CONFIG) --libs $(LIBTRACEEVENT)")
|
|
|
504f18 |
else
|
|
|
504f18 |
.PHONY: warning
|
|
|
504f18 |
warning:
|
|
|
504f18 |
@@ -253,8 +253,8 @@ endif
|
|
|
504f18 |
export LIBTRACEEVENT_CFLAGS LIBTRACEEVENT_LDLAGS
|
|
|
504f18 |
|
|
|
504f18 |
ifeq ("$(TEST_LIBTRACEFS)", "y")
|
|
|
504f18 |
-LIBTRACEFS_CFLAGS = $(shell sh -c "$(PKG_CONFIG) --cflags $(LIBTRACEFS)")
|
|
|
504f18 |
-LIBTRACEFS_LDLAGS = $(shell sh -c "$(PKG_CONFIG) --libs $(LIBTRACEFS)")
|
|
|
504f18 |
+LIBTRACEFS_CFLAGS := $(shell sh -c "$(PKG_CONFIG) --cflags $(LIBTRACEFS)")
|
|
|
504f18 |
+LIBTRACEFS_LDLAGS := $(shell sh -c "$(PKG_CONFIG) --libs $(LIBTRACEFS)")
|
|
|
504f18 |
else
|
|
|
504f18 |
.PHONY: warning
|
|
|
504f18 |
warning:
|
|
|
504f18 |
@@ -324,11 +324,11 @@ endif
|
|
|
504f18 |
export ZLIB_LDLAGS
|
|
|
504f18 |
|
|
|
504f18 |
ifndef NO_LIBZSTD
|
|
|
504f18 |
-TEST_LIBZSTD = $(shell sh -c "$(PKG_CONFIG) --atleast-version 1.4.0 libzstd > /dev/null 2>&1 && echo y")
|
|
|
504f18 |
+TEST_LIBZSTD := $(shell sh -c "$(PKG_CONFIG) --atleast-version 1.4.0 libzstd > /dev/null 2>&1 && echo y")
|
|
|
504f18 |
|
|
|
504f18 |
ifeq ("$(TEST_LIBZSTD)", "y")
|
|
|
504f18 |
-LIBZSTD_CFLAGS = $(shell sh -c "$(PKG_CONFIG) --cflags libzstd")
|
|
|
504f18 |
-LIBZSTD_LDLAGS = $(shell sh -c "$(PKG_CONFIG) --libs libzstd")
|
|
|
504f18 |
+LIBZSTD_CFLAGS := $(shell sh -c "$(PKG_CONFIG) --cflags libzstd")
|
|
|
504f18 |
+LIBZSTD_LDLAGS := $(shell sh -c "$(PKG_CONFIG) --libs libzstd")
|
|
|
504f18 |
CFLAGS += -DHAVE_ZSTD
|
|
|
504f18 |
ZSTD_INSTALLED=1
|
|
|
504f18 |
$(info Have ZSTD compression support)
|
|
|
504f18 |
@@ -571,10 +571,10 @@ report_nopythondev: force
|
|
|
504f18 |
$(Q)echo
|
|
|
504f18 |
|
|
|
504f18 |
ifndef NO_PYTHON
|
|
|
504f18 |
-PYTHON_INCLUDES = `$(PKG_CONFIG) --cflags $(PYTHON_PKGCONFIG_VERS)`
|
|
|
504f18 |
-PYTHON_LDFLAGS = `$(PKG_CONFIG) --libs $(PYTHON_PKGCONFIG_VERS)` \
|
|
|
504f18 |
+PYTHON_INCLUDES := `$(PKG_CONFIG) --cflags $(PYTHON_PKGCONFIG_VERS)`
|
|
|
504f18 |
+PYTHON_LDFLAGS := `$(PKG_CONFIG) --libs $(PYTHON_PKGCONFIG_VERS)` \
|
|
|
504f18 |
$(shell $(PYTHON_VERS)-config --ldflags)
|
|
|
504f18 |
-PYGTK_CFLAGS = `$(PKG_CONFIG) --cflags pygtk-2.0`
|
|
|
504f18 |
+PYGTK_CFLAGS := `$(PKG_CONFIG) --cflags pygtk-2.0`
|
|
|
504f18 |
else
|
|
|
504f18 |
PYTHON_INCLUDES =
|
|
|
504f18 |
PYTHON_LDFLAGS =
|