jeans/motioneyeos
jeans/motioneyeos
1
0
Fork 0
mirror of https://github.com/motioneye-project/motioneyeos.git synced 2025-07-29 06:06:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

packages: use backtick instead of $(shell ...) make function

Browse Source 
It is often difficult to know exactly when make will expand the
variable, and usually it can only be expanded after the dependencies
have been built (e.g. pkg-config or the .pc file). Using a backtick
instead makes it very clear that it will be expanded only while
executing the command.

This change is useful for two cases:

1. The per-package staging (and host) directory will be created as part
   of the configure step, so any $(shell ...) variable that is used in
   the configure step will fail because the directory doesn't exist
   yet.

2. 'make printvars' evaluates the variables it prints. It will therefore
   trigger a lot of errors from missing .pc files and others. The
   backticks, on the other hand, are not expanded, so with this change
   the output of 'make printvars' becomes clean again.

This commit contains only the easy changes: replace $(shell ...) with
`...`, and also replace ' with " where needed. Follow-up commits will
tackle the more complicated cases that need additional explanation.

After this change, the following instances of $(shell ...) will remain:

- All assignments that use :=
- All variables that are used in make conditionals (which don't expand
  the backticks).
- All variables that only refer to system executables and make
  variables that don't change.
- The calls to check-host-* in dependencies.mk, because it is eval'ed.

[Original patch by Fabio Porcedda, but extended quite a bit by Arnout.]

Signed-off-by: Fabio Porcedda <fabio.porcedda@gmail.com>
Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
This commit is contained in:
Arnout Vandecappelle 2015-07-12 16:35:26 +02:00 committed by Thomas Petazzoni
parent b4857df721
commit 7d69a79624
37 changed files with 56 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package/aiccu/aiccu.mk
View File

@ -16,7 +16,7 @@ AICCU_LFDLAGS = $(TARGET_LDFLAGS)
# aiccu forgets to link with gnutls' dependencies breaking the build when # aiccu forgets to link with gnutls' dependencies breaking the build when
# linking statically # linking statically
ifeq ($(BR2_STATIC_LIBS),y) ifeq ($(BR2_STATIC_LIBS),y)
AICCU_LDFLAGS += $(shell $(PKG_CONFIG_HOST_BINARY) --static --libs gnutls) AICCU_LDFLAGS += `$(PKG_CONFIG_HOST_BINARY) --static --libs gnutls`
endif endif
# dummy RPM_OPT_FLAGS to disable stripping # dummy RPM_OPT_FLAGS to disable stripping

2
package/aircrack-ng/aircrack-ng.mk
View File

@ -27,7 +27,7 @@ endif
ifeq ($(BR2_PACKAGE_LIBPCAP),y) ifeq ($(BR2_PACKAGE_LIBPCAP),y)
AIRCRACK_NG_DEPENDENCIES += libpcap AIRCRACK_NG_DEPENDENCIES += libpcap
AIRCRACK_NG_MAKE_OPTS += HAVE_PCAP=yes \ AIRCRACK_NG_MAKE_OPTS += HAVE_PCAP=yes \
$(if $(BR2_STATIC_LIBS),LIBPCAP="-lpcap $(shell $(STAGING_DIR)/usr/bin/pcap-config --static --additional-libs)") $(if $(BR2_STATIC_LIBS),LIBPCAP="-lpcap `$(STAGING_DIR)/usr/bin/pcap-config --static --additional-libs`")
else else
AIRCRACK_NG_MAKE_OPTS += HAVE_PCAP=no AIRCRACK_NG_MAKE_OPTS += HAVE_PCAP=no
endif endif

2
package/bustle/bustle.mk
View File

@ -12,7 +12,7 @@ BUSTLE_DEPENDENCIES = libglib2 libpcap host-pkgconf
BUSTLE_PCAP_FLAGS = "-lpcap" BUSTLE_PCAP_FLAGS = "-lpcap"
ifeq ($(BR2_STATIC_LIBS),y) ifeq ($(BR2_STATIC_LIBS),y)
BUSTLE_PCAP_FLAGS += $(shell $(STAGING_DIR)/usr/bin/pcap-config --static --additional-libs) BUSTLE_PCAP_FLAGS += `$(STAGING_DIR)/usr/bin/pcap-config --static --additional-libs`
endif endif
define BUSTLE_BUILD_CMDS define BUSTLE_BUILD_CMDS

8
package/dbus-python/dbus-python.mk
View File

@ -17,15 +17,15 @@ DBUS_PYTHON_DEPENDENCIES += python host-python
DBUS_PYTHON_CONF_ENV += \ DBUS_PYTHON_CONF_ENV += \
PYTHON=$(HOST_DIR)/usr/bin/python2 \ PYTHON=$(HOST_DIR)/usr/bin/python2 \
PYTHON_INCLUDES="$(shell $(STAGING_DIR)/usr/bin/python2-config --includes)" \ PYTHON_INCLUDES="`$(STAGING_DIR)/usr/bin/python2-config --includes`" \
PYTHON_LIBS="$(shell $(STAGING_DIR)/usr/bin/python2-config --ldflags)" PYTHON_LIBS="`$(STAGING_DIR)/usr/bin/python2-config --ldflags`"
else else
DBUS_PYTHON_DEPENDENCIES += python3 host-python3 DBUS_PYTHON_DEPENDENCIES += python3 host-python3
DBUS_PYTHON_CONF_ENV += \ DBUS_PYTHON_CONF_ENV += \
PYTHON=$(HOST_DIR)/usr/bin/python3 \ PYTHON=$(HOST_DIR)/usr/bin/python3 \
PYTHON_INCLUDES="$(shell $(STAGING_DIR)/usr/bin/python3-config --includes)" \ PYTHON_INCLUDES="`$(STAGING_DIR)/usr/bin/python3-config --includes`" \
PYTHON_LIBS="$(shell $(STAGING_DIR)/usr/bin/python3-config --ldflags)" PYTHON_LIBS="`$(STAGING_DIR)/usr/bin/python3-config --ldflags`"
endif endif
$(eval $(autotools-package)) $(eval $(autotools-package))

2
package/dhcpdump/dhcpdump.mk
View File

@ -12,7 +12,7 @@ DHCPDUMP_LICENSE_FILES = LICENSE
DHCPDUMP_LIBS = -lpcap DHCPDUMP_LIBS = -lpcap
ifeq ($(BR2_STATIC_LIBS),y) ifeq ($(BR2_STATIC_LIBS),y)
DHCPDUMP_LIBS += $(shell $(STAGING_DIR)/usr/bin/pcap-config --static --additional-libs) DHCPDUMP_LIBS += `$(STAGING_DIR)/usr/bin/pcap-config --static --additional-libs`
endif endif
define DHCPDUMP_BUILD_CMDS define DHCPDUMP_BUILD_CMDS

2
package/ejabberd/ejabberd.mk
View File

@ -26,7 +26,7 @@ EJABBERD_ERLANG_LIBS = sasl crypto public_key ssl mnesia inets compiler
EJABBERD_CONF_ENV = \ EJABBERD_CONF_ENV = \
ac_cv_erlang_root_dir="$(HOST_DIR)/usr/lib/erlang" \ ac_cv_erlang_root_dir="$(HOST_DIR)/usr/lib/erlang" \
$(foreach lib,$(EJABBERD_ERLANG_LIBS), \ $(foreach lib,$(EJABBERD_ERLANG_LIBS), \
ac_cv_erlang_lib_dir_$(lib)="$(shell package/ejabberd/check-erlang-lib $(lib))") ac_cv_erlang_lib_dir_$(lib)="`package/ejabberd/check-erlang-lib $(lib)`")
define EJABBERD_INSTALL_TARGET_CMDS define EJABBERD_INSTALL_TARGET_CMDS
$(TARGET_MAKE_ENV) $(MAKE) DESTDIR=$(TARGET_DIR) install -C $(@D) $(TARGET_MAKE_ENV) $(MAKE) DESTDIR=$(TARGET_DIR) install -C $(@D)

2
package/fbv/fbv.mk
View File

@ -18,7 +18,7 @@ FBV_DEPENDENCIES += libpng
# libpng in turn depends on other libraries # libpng in turn depends on other libraries
ifeq ($(BR2_STATIC_LIBS),y) ifeq ($(BR2_STATIC_LIBS),y)
FBV_CONFIGURE_OPTS += "--libs=$(shell $(PKG_CONFIG_HOST_BINARY) --libs libpng --static)" FBV_CONFIGURE_OPTS += "--libs=`$(PKG_CONFIG_HOST_BINARY) --libs libpng --static`"
endif endif
else else

2
package/gdk-pixbuf/gdk-pixbuf.mk
View File

@ -35,7 +35,7 @@ GDK_PIXBUF_CONF_OPTS += --without-libtiff
else else
GDK_PIXBUF_DEPENDENCIES += tiff host-pkgconf GDK_PIXBUF_DEPENDENCIES += tiff host-pkgconf
GDK_PIXBUF_CONF_ENV += \ GDK_PIXBUF_CONF_ENV += \
LIBS='$(shell $(PKG_CONFIG_HOST_BINARY) --libs libtiff-4)' LIBS="`$(PKG_CONFIG_HOST_BINARY) --libs libtiff-4`"
endif endif
ifeq ($(BR2_PACKAGE_XLIB_LIBX11),y) ifeq ($(BR2_PACKAGE_XLIB_LIBX11),y)

4
package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk
View File

@ -119,8 +119,8 @@ ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_LIB_OPENGL_EGL),y)
GST1_PLUGINS_BAD_CONF_OPTS += --enable-egl GST1_PLUGINS_BAD_CONF_OPTS += --enable-egl
GST1_PLUGINS_BAD_DEPENDENCIES += libegl GST1_PLUGINS_BAD_DEPENDENCIES += libegl
GST1_PLUGINS_BAD_CONF_ENV += \ GST1_PLUGINS_BAD_CONF_ENV += \
CPPFLAGS="$(TARGET_CPPFLAGS) $(shell $(PKG_CONFIG_HOST_BINARY) --cflags egl)" \ CPPFLAGS="$(TARGET_CPPFLAGS) `$(PKG_CONFIG_HOST_BINARY) --cflags egl`" \
LIBS="$(shell $(PKG_CONFIG_HOST_BINARY) --libs egl)" LIBS="`$(PKG_CONFIG_HOST_BINARY) --libs egl`"
else else
GST1_PLUGINS_BAD_CONF_OPTS += --disable-egl GST1_PLUGINS_BAD_CONF_OPTS += --disable-egl
endif endif

2
package/iftop/iftop.mk
View File

@ -12,7 +12,7 @@ IFTOP_LICENSE_FILES = COPYING
IFTOP_LIBS = -lpcap IFTOP_LIBS = -lpcap
ifeq ($(BR2_STATIC_LIBS),y) ifeq ($(BR2_STATIC_LIBS),y)
IFTOP_LIBS += $(shell $(STAGING_DIR)/usr/bin/pcap-config --static --additional-libs) IFTOP_LIBS += `$(STAGING_DIR)/usr/bin/pcap-config --static --additional-libs`
endif endif
IFTOP_CONF_ENV += LIBS+="$(IFTOP_LIBS)" IFTOP_CONF_ENV += LIBS+="$(IFTOP_LIBS)"

2
package/knock/knock.mk
View File

@ -11,7 +11,7 @@ KNOCK_LICENSE_FILES = COPYING
KNOCK_DEPENDENCIES = libpcap KNOCK_DEPENDENCIES = libpcap
ifeq ($(BR2_STATIC_LIBS),y) ifeq ($(BR2_STATIC_LIBS),y)
KNOCK_CONF_OPTS = LIBS="$(shell $(STAGING_DIR)/usr/bin/pcap-config --static --additional-libs)" KNOCK_CONF_OPTS = LIBS="`$(STAGING_DIR)/usr/bin/pcap-config --static --additional-libs`"
endif endif
$(eval $(autotools-package)) $(eval $(autotools-package))

2
package/kodi/kodi.mk
View File

@ -112,7 +112,7 @@ else
KODI_CONF_OPTS += --disable-gl --disable-rsxs --disable-sdl --disable-x11 --disable-xrandr KODI_CONF_OPTS += --disable-gl --disable-rsxs --disable-sdl --disable-x11 --disable-xrandr
ifeq ($(BR2_PACKAGE_KODI_EGL_GLES),y) ifeq ($(BR2_PACKAGE_KODI_EGL_GLES),y)
KODI_DEPENDENCIES += libegl libgles KODI_DEPENDENCIES += libegl libgles
KODI_CONF_ENV += CXXFLAGS="$(TARGET_CXXFLAGS) $(shell $(PKG_CONFIG_HOST_BINARY) --cflags egl)" KODI_CONF_ENV += CXXFLAGS="$(TARGET_CXXFLAGS) `$(PKG_CONFIG_HOST_BINARY) --cflags egl`"
KODI_CONF_OPTS += --enable-gles KODI_CONF_OPTS += --enable-gles
else else
KODI_CONF_OPTS += --disable-gles KODI_CONF_OPTS += --disable-gles

3
package/libgtk3/libgtk3.mk
View File

@ -149,8 +149,7 @@ HOST_LIBGTK3_DEPENDENCIES = \
host-pkgconf host-pkgconf
HOST_LIBGTK3_CFLAGS = \ HOST_LIBGTK3_CFLAGS = \
$(shell $(HOST_DIR)/usr/bin/pkgconf \ `$(HOST_DIR)/usr/bin/pkgconf --cflags --libs gdk-pixbuf-2.0`
--cflags --libs gdk-pixbuf-2.0)
define HOST_LIBGTK3_CONFIGURE_CMDS define HOST_LIBGTK3_CONFIGURE_CMDS
echo "#define GETTEXT_PACKAGE \"gtk30\"" >> $(@D)/gtk/config.h echo "#define GETTEXT_PACKAGE \"gtk30\"" >> $(@D)/gtk/config.h

2
package/libmicrohttpd/libmicrohttpd.mk
View File

@ -13,7 +13,7 @@ LIBMICROHTTPD_CONF_OPTS = --disable-curl --disable-spdy --disable-examples
ifeq ($(BR2_PACKAGE_LIBMICROHTTPD_SSL),y) ifeq ($(BR2_PACKAGE_LIBMICROHTTPD_SSL),y)
LIBMICROHTTPD_LICENSE = LGPLv2.1+ LIBMICROHTTPD_LICENSE = LGPLv2.1+
LIBMICROHTTPD_DEPENDENCIES += host-pkgconf gnutls libgcrypt LIBMICROHTTPD_DEPENDENCIES += host-pkgconf gnutls libgcrypt
LIBMICROHTTPD_CONF_ENV += LIBS="$(shell $(PKG_CONFIG_HOST_BINARY) --libs gnutls)" LIBMICROHTTPD_CONF_ENV += LIBS="`$(PKG_CONFIG_HOST_BINARY) --libs gnutls`"
LIBMICROHTTPD_CONF_OPTS += --enable-https --with-gnutls=$(STAGING_DIR)/usr \ LIBMICROHTTPD_CONF_OPTS += --enable-https --with-gnutls=$(STAGING_DIR)/usr \
--with-libgcrypt-prefix=$(STAGING_DIR)/usr --with-libgcrypt-prefix=$(STAGING_DIR)/usr
else else

2
package/libssh2/libssh2.mk
View File

@ -20,7 +20,7 @@ LIBSSH2_CONF_OPTS += --with-libgcrypt \
--without-openssl --without-openssl
# configure.ac forgets to link to dependent libraries of gcrypt breaking static # configure.ac forgets to link to dependent libraries of gcrypt breaking static
# linking # linking
LIBSSH2_CONF_ENV += LIBS="$(shell $(STAGING_DIR)/usr/bin/libgcrypt-config --libs)" LIBSSH2_CONF_ENV += LIBS="`$(STAGING_DIR)/usr/bin/libgcrypt-config --libs`"
else else
LIBSSH2_DEPENDENCIES += openssl LIBSSH2_DEPENDENCIES += openssl
LIBSSH2_CONF_OPTS += --with-openssl \ LIBSSH2_CONF_OPTS += --with-openssl \

2
package/libupnpp/libupnpp.mk
View File

@ -16,7 +16,7 @@ LIBUPNPP_DEPENDENCIES = expat libcurl libupnp
ifeq ($(BR2_STATIC_LIBS),y) ifeq ($(BR2_STATIC_LIBS),y)
LIBUPNPP_DEPENDENCIES += host-pkgconf LIBUPNPP_DEPENDENCIES += host-pkgconf
LIBUPNPP_CONF_ENV += \ LIBUPNPP_CONF_ENV += \
LIBS='$(shell $(PKG_CONFIG_HOST_BINARY) --libs libupnp libcurl)' LIBS="`$(PKG_CONFIG_HOST_BINARY) --libs libupnp libcurl`"
endif endif
$(eval $(autotools-package)) $(eval $(autotools-package))

4
package/lmbench/lmbench.mk
View File

@ -14,8 +14,8 @@ LMBENCH_CFLAGS = $(TARGET_CFLAGS)
ifeq ($(BR2_PACKAGE_LIBTIRPC),y) ifeq ($(BR2_PACKAGE_LIBTIRPC),y)
LMBENCH_DEPENDENCIES += host-pkgconf libtirpc LMBENCH_DEPENDENCIES += host-pkgconf libtirpc
LMBENCH_CFLAGS += $(shell $(PKG_CONFIG_HOST_BINARY) --cflags libtirpc) LMBENCH_CFLAGS += `$(PKG_CONFIG_HOST_BINARY) --cflags libtirpc`
LMBENCH_LDLIBS = $(shell $(PKG_CONFIG_HOST_BINARY) --libs libtirpc) LMBENCH_LDLIBS = `$(PKG_CONFIG_HOST_BINARY) --libs libtirpc`
endif endif
define LMBENCH_CONFIGURE_CMDS define LMBENCH_CONFIGURE_CMDS

2
package/logrotate/logrotate.mk
View File

@ -11,7 +11,7 @@ LOGROTATE_LICENSE_FILES = COPYING
LOGROTATE_DEPENDENCIES = popt host-pkgconf LOGROTATE_DEPENDENCIES = popt host-pkgconf
# tarball does not have a generated configure script # tarball does not have a generated configure script
LOGROTATE_AUTORECONF = YES LOGROTATE_AUTORECONF = YES
LOGROTATE_CONF_ENV = LIBS="$(shell $(PKG_CONFIG_HOST_BINARY) --libs popt)" LOGROTATE_CONF_ENV = LIBS="`$(PKG_CONFIG_HOST_BINARY) --libs popt`"
LOGROTATE_CONF_OPTS = --without-selinux LOGROTATE_CONF_OPTS = --without-selinux
ifeq ($(BR2_PACKAGE_ACL),y) ifeq ($(BR2_PACKAGE_ACL),y)

2
package/madplay/madplay.mk
View File

@ -16,7 +16,7 @@ MADPLAY_DEPENDENCIES = libmad libid3tag $(if $(BR2_PACKAGE_GETTEXT),gettext)
ifeq ($(BR2_PACKAGE_MADPLAY_ALSA),y) ifeq ($(BR2_PACKAGE_MADPLAY_ALSA),y)
MADPLAY_CONF_OPTS += --with-alsa MADPLAY_CONF_OPTS += --with-alsa
MADPLAY_DEPENDENCIES += host-pkgconf alsa-lib MADPLAY_DEPENDENCIES += host-pkgconf alsa-lib
MADPLAY_CONF_ENV += LIBS="$(shell $(PKG_CONFIG_HOST_BINARY) --libs alsa)" MADPLAY_CONF_ENV += LIBS="`$(PKG_CONFIG_HOST_BINARY) --libs alsa`"
endif endif
$(eval $(autotools-package)) $(eval $(autotools-package))

2
package/mpg123/mpg123.mk
View File

@ -54,7 +54,7 @@ MPG123_CONF_OPTS += --with-default-audio=portaudio
MPG123_DEPENDENCIES += portaudio MPG123_DEPENDENCIES += portaudio
# configure script does NOT use pkg-config to figure out how to link # configure script does NOT use pkg-config to figure out how to link
# with portaudio, breaking static linking as portaudio uses pthreads # with portaudio, breaking static linking as portaudio uses pthreads
MPG123_CONF_ENV += LIBS='$(shell $(PKG_CONFIG_HOST_BINARY) --libs portaudio-2.0)' MPG123_CONF_ENV += LIBS="`$(PKG_CONFIG_HOST_BINARY) --libs portaudio-2.0`"
endif endif
ifeq ($(BR2_PACKAGE_SDL),y) ifeq ($(BR2_PACKAGE_SDL),y)

2
package/neardal/neardal.mk
View File

@ -25,7 +25,7 @@ endif
# forgets to take that into account, causing the detection to fail # forgets to take that into account, causing the detection to fail
# when linking statically # when linking statically
ifeq ($(BR2_STATIC_LIBS),y) ifeq ($(BR2_STATIC_LIBS),y)
NEARDAL_CONF_ENV += LIBS='$(shell $(PKG_CONFIG_HOST_BINARY) --libs ncurses)' NEARDAL_CONF_ENV += LIBS="`$(PKG_CONFIG_HOST_BINARY) --libs ncurses`"
endif endif
define NEARDAL_INSTALL_NCL define NEARDAL_INSTALL_NCL

2
package/ngrep/ngrep.mk
View File

@ -13,7 +13,7 @@ NGREP_INSTALL_STAGING = YES
NGREP_LIBS = -lpcap -lpcre NGREP_LIBS = -lpcap -lpcre
ifeq ($(BR2_STATIC_LIBS),y) ifeq ($(BR2_STATIC_LIBS),y)
NGREP_LIBS += $(shell $(STAGING_DIR)/usr/bin/pcap-config --static --additional-libs) NGREP_LIBS += `$(STAGING_DIR)/usr/bin/pcap-config --static --additional-libs`
endif endif
NGREP_CONF_ENV += LIBS+="$(NGREP_LIBS)" NGREP_CONF_ENV += LIBS+="$(NGREP_LIBS)"

4
package/nmap/nmap.mk
View File

@ -15,10 +15,10 @@ NMAP_LICENSE = GPLv2
NMAP_LICENSE_FILES = COPYING NMAP_LICENSE_FILES = COPYING
# needed by libpcap # needed by libpcap
NMAP_LIBS_FOR_STATIC_LINK += $(shell $(STAGING_DIR)/usr/bin/pcap-config --static --additional-libs) NMAP_LIBS_FOR_STATIC_LINK += `$(STAGING_DIR)/usr/bin/pcap-config --static --additional-libs`
ifeq ($(BR2_STATIC_LIBS),y) ifeq ($(BR2_STATIC_LIBS),y)
NMAP_CONF_ENV += LIBS='$(NMAP_LIBS_FOR_STATIC_LINK)' NMAP_CONF_ENV += LIBS="$(NMAP_LIBS_FOR_STATIC_LINK)"
endif endif
# for 0001-libdnet-wrapper-configure.patch # for 0001-libdnet-wrapper-configure.patch

2
package/openldap/openldap.mk
View File

@ -31,7 +31,7 @@ endif
ifeq ($(BR2_PACKAGE_OPENSSL),y) ifeq ($(BR2_PACKAGE_OPENSSL),y)
OPENLDAP_MP = bignum OPENLDAP_MP = bignum
OPENLDAP_DEPENDENCIES += openssl OPENLDAP_DEPENDENCIES += openssl
OPENLDAP_CONF_ENV = LIBS="$(shell $(PKG_CONFIG_HOST_BINARY) --libs libssl libcrypto)" OPENLDAP_CONF_ENV = LIBS="`$(PKG_CONFIG_HOST_BINARY) --libs libssl libcrypto`"
else ifeq ($(BR2_PACKAGE_GMP),y) else ifeq ($(BR2_PACKAGE_GMP),y)
OPENLDAP_MP = gmp OPENLDAP_MP = gmp
OPENLDAP_DEPENDENCIES += gmp OPENLDAP_DEPENDENCIES += gmp

4
package/php/php.mk
View File

@ -116,7 +116,7 @@ PHP_CONF_OPTS += --with-openssl=$(STAGING_DIR)/usr
PHP_DEPENDENCIES += openssl PHP_DEPENDENCIES += openssl
# openssl needs zlib, but the configure script forgets to link against # openssl needs zlib, but the configure script forgets to link against
# it causing detection failures with static linking # it causing detection failures with static linking
PHP_STATIC_LIBS += $(shell $(PKG_CONFIG_HOST_BINARY) --libs --static openssl) PHP_STATIC_LIBS += `$(PKG_CONFIG_HOST_BINARY) --libs --static openssl`
endif endif
ifeq ($(BR2_PACKAGE_PHP_EXT_LIBXML2),y) ifeq ($(BR2_PACKAGE_PHP_EXT_LIBXML2),y)
@ -187,7 +187,7 @@ endif
ifeq ($(BR2_PACKAGE_PHP_EXT_SQLITE),y) ifeq ($(BR2_PACKAGE_PHP_EXT_SQLITE),y)
PHP_CONF_OPTS += --with-sqlite3=$(STAGING_DIR)/usr PHP_CONF_OPTS += --with-sqlite3=$(STAGING_DIR)/usr
PHP_DEPENDENCIES += sqlite PHP_DEPENDENCIES += sqlite
PHP_STATIC_LIBS += $(shell $(PKG_CONFIG_HOST_BINARY) --libs --static sqlite3) PHP_STATIC_LIBS += `$(PKG_CONFIG_HOST_BINARY) --libs --static sqlite3`
endif endif
### PDO ### PDO

2
package/poppler/poppler.mk
View File

@ -24,7 +24,7 @@ ifeq ($(BR2_PACKAGE_TIFF),y)
POPPLER_CONF_OPTS += --enable-libtiff POPPLER_CONF_OPTS += --enable-libtiff
# Help poppler to find libtiff in static linking scenarios # Help poppler to find libtiff in static linking scenarios
POPPLER_CONF_ENV += \ POPPLER_CONF_ENV += \
LIBTIFF_LIBS="$(shell $(PKG_CONFIG_HOST_BINARY) --libs libtiff-4)" LIBTIFF_LIBS="`$(PKG_CONFIG_HOST_BINARY) --libs libtiff-4`"
POPPLER_DEPENDENCIES += tiff POPPLER_DEPENDENCIES += tiff
else else
POPPLER_CONF_OPTS += --disable-libtiff POPPLER_CONF_OPTS += --disable-libtiff

2
package/prboom/prboom.mk
View File

@ -18,7 +18,7 @@ endif
ifeq ($(BR2_STATIC_LIBS),y) ifeq ($(BR2_STATIC_LIBS),y)
# SDL_mixer uses symbols from SDL, but ends up after it on the link # SDL_mixer uses symbols from SDL, but ends up after it on the link
# cmdline. Fix it by forcing the SDL libs at the very end # cmdline. Fix it by forcing the SDL libs at the very end
PRBOOM_CONF_ENV += LIBS="$(shell $(STAGING_DIR)/usr/bin/sdl-config --static-libs)" PRBOOM_CONF_ENV += LIBS="`$(STAGING_DIR)/usr/bin/sdl-config --static-libs`"
endif endif
PRBOOM_CONF_OPTS = \ PRBOOM_CONF_OPTS = \

2
package/ptpd2/ptpd2.mk
View File

@ -14,7 +14,7 @@ PTPD2_LICENSE = BSD-2c
PTPD2_LICENSE_FILES = COPYRIGHT PTPD2_LICENSE_FILES = COPYRIGHT
ifeq ($(BR2_STATIC_LIBS),y) ifeq ($(BR2_STATIC_LIBS),y)
PTPD2_CONF_OPTS += LIBS="$(shell $(STAGING_DIR)/usr/bin/pcap-config --static --additional-libs)" PTPD2_CONF_OPTS += LIBS="`$(STAGING_DIR)/usr/bin/pcap-config --static --additional-libs`"
endif endif
ifeq ($(BR2_PACKAGE_NETSNMP),y) ifeq ($(BR2_PACKAGE_NETSNMP),y)

4
package/python-gobject/python-gobject.mk
View File

@ -20,13 +20,13 @@ PYTHON_GOBJECT_DEPENDENCIES += python host-python
PYTHON_GOBJECT_CONF_ENV = \ PYTHON_GOBJECT_CONF_ENV = \
PYTHON=$(HOST_DIR)/usr/bin/python2 \ PYTHON=$(HOST_DIR)/usr/bin/python2 \
PYTHON_INCLUDES="$(shell $(STAGING_DIR)/usr/bin/python2-config --includes)" PYTHON_INCLUDES="`$(STAGING_DIR)/usr/bin/python2-config --includes`"
else else
PYTHON_GOBJECT_DEPENDENCIES += python3 host-python3 PYTHON_GOBJECT_DEPENDENCIES += python3 host-python3
PYTHON_GOBJECT_CONF_ENV = \ PYTHON_GOBJECT_CONF_ENV = \
PYTHON=$(HOST_DIR)/usr/bin/python3 \ PYTHON=$(HOST_DIR)/usr/bin/python3 \
PYTHON_INCLUDES="$(shell $(STAGING_DIR)/usr/bin/python3-config --includes)" PYTHON_INCLUDES="`$(STAGING_DIR)/usr/bin/python3-config --includes`"
endif endif
ifeq ($(BR2_PACKAGE_LIBFFI),y) ifeq ($(BR2_PACKAGE_LIBFFI),y)

6
package/python-pygame/python-pygame.mk
View File

@ -66,14 +66,14 @@ define PYTHON_PYGAME_UNCONFIGURE_SCRAP
endef endef
endif endif
PYTHON_PYGAME_SDL_FLAGS = $(shell $(STAGING_DIR)/usr/bin/sdl-config --cflags) PYTHON_PYGAME_SDL_FLAGS = `$(STAGING_DIR)/usr/bin/sdl-config --cflags`
PYTHON_PYGAME_SDL_FLAGS += $(shell $(STAGING_DIR)/usr/bin/sdl-config --libs) PYTHON_PYGAME_SDL_FLAGS += `$(STAGING_DIR)/usr/bin/sdl-config --libs`
# Pygame needs a Setup file where options should be commented out if # Pygame needs a Setup file where options should be commented out if
# dependencies are not available # dependencies are not available
define PYTHON_PYGAME_CONFIGURE_CMDS define PYTHON_PYGAME_CONFIGURE_CMDS
cp -f $(@D)/Setup.in $(@D)/Setup cp -f $(@D)/Setup.in $(@D)/Setup
$(SED) 's~^SDL = ~SDL = $(PYTHON_PYGAME_SDL_FLAGS) \n#~' $(@D)/Setup $(SED) "s~^SDL = ~SDL = $(PYTHON_PYGAME_SDL_FLAGS) \n#~" $(@D)/Setup
$(SED) 's/^pypm/#pypm/' $(@D)/Setup $(SED) 's/^pypm/#pypm/' $(@D)/Setup
$(PYTHON_PYGAME_UNCONFIGURE_IMAGE) $(PYTHON_PYGAME_UNCONFIGURE_IMAGE)
$(PYTHON_PYGAME_UNCONFIGURE_FONT) $(PYTHON_PYGAME_UNCONFIGURE_FONT)

14
package/qt/qt.mk
View File

@ -230,9 +230,9 @@ QT_DEPENDENCIES += fontconfig xlib_libXi xlib_libX11 xlib_libXrender \
xlib_libXcursor xlib_libXrandr xlib_libXext xlib_libXv xlib_libXcursor xlib_libXrandr xlib_libXext xlib_libXv
# Using pkg-config avoids us some logic to redefine and sed again mkspecs files # Using pkg-config avoids us some logic to redefine and sed again mkspecs files
# to add X11 include path and link options # to add X11 include path and link options
QT_CFLAGS += $(shell $(PKG_CONFIG_HOST_BINARY) --cflags x11) QT_CFLAGS += `$(PKG_CONFIG_HOST_BINARY) --cflags x11`
QT_CXXFLAGS += $(shell $(PKG_CONFIG_HOST_BINARY) --cflags x11) QT_CXXFLAGS += `$(PKG_CONFIG_HOST_BINARY) --cflags x11`
QT_LDFLAGS += $(shell $(PKG_CONFIG_HOST_BINARY) --libs x11 xext) QT_LDFLAGS += `$(PKG_CONFIG_HOST_BINARY) --libs x11 xext`
QT_CONFIGURE_OPTS += -arch $(QT_EMB_PLATFORM) \ QT_CONFIGURE_OPTS += -arch $(QT_EMB_PLATFORM) \
-xplatform qws/linux-$(QT_EMB_PLATFORM)-g++ -x11 -no-gtkstyle -no-sm \ -xplatform qws/linux-$(QT_EMB_PLATFORM)-g++ -x11 -no-gtkstyle -no-sm \
-no-openvg -no-openvg
@ -329,9 +329,9 @@ endif
ifeq ($(BR2_PACKAGE_QT_OPENGL_ES),y) ifeq ($(BR2_PACKAGE_QT_OPENGL_ES),y)
QT_CONFIGURE_OPTS += -opengl es2 -egl QT_CONFIGURE_OPTS += -opengl es2 -egl
QT_DEPENDENCIES += libgles libegl QT_DEPENDENCIES += libgles libegl
QT_CFLAGS += $(shell $(PKG_CONFIG_HOST_BINARY) --cflags egl) QT_CFLAGS += `$(PKG_CONFIG_HOST_BINARY) --cflags egl`
QT_CXXFLAGS += $(shell $(PKG_CONFIG_HOST_BINARY) --cflags egl) QT_CXXFLAGS += `$(PKG_CONFIG_HOST_BINARY) --cflags egl`
QT_LDFLAGS += $(shell $(PKG_CONFIG_HOST_BINARY) --libs egl) QT_LDFLAGS += `$(PKG_CONFIG_HOST_BINARY) --libs egl`
else else
QT_CONFIGURE_OPTS += -no-opengl QT_CONFIGURE_OPTS += -no-opengl
endif endif
@ -473,7 +473,7 @@ QT_QMAKE = $(HOST_DIR)/usr/bin/qmake -spec qws/linux-$(QT_EMB_PLATFORM)-g++
################################################################################ ################################################################################
define QT_QMAKE_SET define QT_QMAKE_SET
$(SED) '/$(1)/d' $(3)/mkspecs/qws/linux-$(QT_EMB_PLATFORM)-g++/qmake.conf $(SED) '/$(1)/d' $(3)/mkspecs/qws/linux-$(QT_EMB_PLATFORM)-g++/qmake.conf
$(SED) '/include.*qws.conf/a$(1) = $(2)' $(3)/mkspecs/qws/linux-$(QT_EMB_PLATFORM)-g++/qmake.conf $(SED) "/include.*qws.conf/a$(1) = $(2)" $(3)/mkspecs/qws/linux-$(QT_EMB_PLATFORM)-g++/qmake.conf
endef endef
ifneq ($(QT_CONFIG_FILE),) ifneq ($(QT_CONFIG_FILE),)

2
package/tcpdump/tcpdump.mk
View File

@ -19,7 +19,7 @@ TCPDUMP_CONF_OPTS = \
TCPDUMP_DEPENDENCIES = zlib libpcap TCPDUMP_DEPENDENCIES = zlib libpcap
ifeq ($(BR2_STATIC_LIBS),y) ifeq ($(BR2_STATIC_LIBS),y)
TCPDUMP_CONF_OPTS += LIBS="$(shell $(STAGING_DIR)/usr/bin/pcap-config --static --additional-libs)" TCPDUMP_CONF_OPTS += LIBS="`$(STAGING_DIR)/usr/bin/pcap-config --static --additional-libs`"
endif endif
# make install installs an unneeded extra copy of the tcpdump binary # make install installs an unneeded extra copy of the tcpdump binary

6
package/tcpreplay/tcpreplay.mk
View File

@ -16,9 +16,9 @@ TCPREPLAY_CONF_OPTS = --with-libpcap=$(STAGING_DIR)/usr
TCPREPLAY_DEPENDENCIES = libpcap TCPREPLAY_DEPENDENCIES = libpcap
# libpcap may depend on symbols in other libs # libpcap may depend on symbols in other libs
TCPREPLAY_LIBS = $(shell $(STAGING_DIR)/usr/bin/pcap-config --static --libs) TCPREPLAY_LIBS = $(STAGING_DIR)/usr/bin/pcap-config --static --libs
TCPREPLAY_CONF_ENV += ac_cv_search_pcap_close='$(TCPREPLAY_LIBS)' \ TCPREPLAY_CONF_ENV += ac_cv_search_pcap_close="`$(TCPREPLAY_LIBS)`" \
LIBS="$(TCPREPLAY_LIBS)" LIBS="`$(TCPREPLAY_LIBS)`"
ifeq ($(BR2_PACKAGE_TCPDUMP),y) ifeq ($(BR2_PACKAGE_TCPDUMP),y)
TCPREPLAY_CONF_ENV += ac_cv_path_tcpdump_path=/usr/sbin/tcpdump TCPREPLAY_CONF_ENV += ac_cv_path_tcpdump_path=/usr/sbin/tcpdump

4
package/ti-utils/ti-utils.mk
View File

@ -10,8 +10,8 @@ TI_UTILS_DEPENDENCIES = libnl host-pkgconf
TI_UTILS_LICENSE = BSD-3c TI_UTILS_LICENSE = BSD-3c
TI_UTILS_LICENSE_FILES = COPYING TI_UTILS_LICENSE_FILES = COPYING
TI_UTILS_CFLAGS = $(shell $(PKG_CONFIG_HOST_BINARY) --cflags libnl-genl-3.0) TI_UTILS_CFLAGS = `$(PKG_CONFIG_HOST_BINARY) --cflags libnl-genl-3.0`
TI_UTILS_LIBS = $(shell $(PKG_CONFIG_HOST_BINARY) --libs libnl-genl-3.0) TI_UTILS_LIBS = `$(PKG_CONFIG_HOST_BINARY) --libs libnl-genl-3.0`
define TI_UTILS_BUILD_CMDS define TI_UTILS_BUILD_CMDS
$(MAKE1) NFSROOT="$(STAGING_DIR)" \ $(MAKE1) NFSROOT="$(STAGING_DIR)" \

2
package/upmpdcli/upmpdcli.mk
View File

@ -19,7 +19,7 @@ ifeq ($(BR2_STATIC_LIBS),y)
# manually pass it to make. # manually pass it to make.
UPMPDCLI_DEPENDENCIES += host-pkgconf UPMPDCLI_DEPENDENCIES += host-pkgconf
UPMPDCLI_MAKE_OPTS = \ UPMPDCLI_MAKE_OPTS = \
LIBS='$(shell $(PKG_CONFIG_HOST_BINARY) --libs expat libcurl libupnp)' LIBS="`$(PKG_CONFIG_HOST_BINARY) --libs expat libcurl libupnp`"
endif endif
# Upmpdcli only runs if user upmpdcli exists # Upmpdcli only runs if user upmpdcli exists

2
package/vsftpd/vsftpd.mk
View File

@ -24,7 +24,7 @@ endif
ifeq ($(BR2_PACKAGE_OPENSSL),y) ifeq ($(BR2_PACKAGE_OPENSSL),y)
VSFTPD_DEPENDENCIES += openssl host-pkgconf VSFTPD_DEPENDENCIES += openssl host-pkgconf
VSFTPD_LIBS += $(shell $(PKG_CONFIG_HOST_BINARY) --libs libssl libcrypto) VSFTPD_LIBS += `$(PKG_CONFIG_HOST_BINARY) --libs libssl libcrypto`
VSFTPD_POST_CONFIGURE_HOOKS += VSFTPD_ENABLE_SSL VSFTPD_POST_CONFIGURE_HOOKS += VSFTPD_ENABLE_SSL
endif endif

2
package/xl2tp/xl2tp.mk
View File

@ -11,7 +11,7 @@ XL2TP_LICENSE = GPLv2
XL2TP_LICENSE_FILES = LICENSE XL2TP_LICENSE_FILES = LICENSE
ifeq ($(BR2_STATIC_LIBS),y) ifeq ($(BR2_STATIC_LIBS),y)
XL2TP_LDLIBS = LDLIBS="$(shell $(STAGING_DIR)/usr/bin/pcap-config --static --additional-libs)" XL2TP_LDLIBS = LDLIBS="`$(STAGING_DIR)/usr/bin/pcap-config --static --additional-libs`"
endif endif
define XL2TP_BUILD_CMDS define XL2TP_BUILD_CMDS