Skip to contentSkip to conversation

Makefile: auto-target automatically pass --program-prefix=""

PATCH New Yann E. MORIN 2 participants 23 messages Aug 9, 2011 – Sep 11, 2011

lore
Share & tools
lore

Yann E. MORIN

author
#0 lore raw

PATCH 1/22 Makefile: auto-target automatically pass --program-prefix=""

When cross-compiled, some packages incorrectly prefix their executables with the target tuple.

Fix that by forcing the program prefix to the empty string when calling ./configure, but only when compiling for target, not for host.

Signed-off-by "Yann E. MORIN" <[email protected]>
---
 package/Makefile.autotools.in |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)
package/Makefile.autotools.in +1 -0
index 46ab861..7f04c36 100644
@@ -100,6 +100,7 @@ define $(2)_CONFIGURE_CMDS
 		--prefix=/usr \
 		--exec-prefix=/usr \
 		--sysconfdir=/etc \
+		--program-prefix="" \
 		$$(DISABLE_DOCUMENTATION) \
 		$$(DISABLE_NLS) \
 		$$(DISABLE_LARGEFILE) \
Signature · 1 line
1.7.2.5
author
#1 lore raw

PATCH 2/22 mpg123: remove --program-prefix

--program-prefix is now set in the auto-target infrastructure.

Signed-off-by "Yann E. MORIN" <[email protected]>
---
 package/multimedia/mpg123/mpg123.mk |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
package/multimedia/mpg123/mpg123.mk +1 -1
index 8eeb56d..43f631c 100644
@@ -32,7 +32,7 @@ ifeq ($(BR2_x86_64),y)
 MPG123_CPU = x86-64
 endif
 
-MPG123_CONF_OPT += --program-prefix='' --with-cpu=$(MPG123_CPU)
+MPG123_CONF_OPT += --with-cpu=$(MPG123_CPU)
 
 # Check if ALSA is built, then we should configure after alsa-lib so
 # ./configure can find alsa-lib.
Signature · 1 line
1.7.2.5
author
#2 lore raw

PATCH 3/22 taglib: remove --program-prefix

In reply to Yann E. MORIN

--program-prefix is now set in the auto-target infrastructure.

Signed-off-by "Yann E. MORIN" <[email protected]>
---
 package/multimedia/taglib/taglib.mk |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
package/multimedia/taglib/taglib.mk +1 -1
index e5433a4..5b480bb 100644
@@ -14,7 +14,7 @@ TAGLIB_CONF_ENV = \
 	ac_cv_header_cppunit_extensions_HelperMacros_h=no \
 	ac_cv_header_zlib_h=$(if $(BR2_PACKAGE_ZLIB),yes,no)
 
-TAGLIB_CONF_OPT = --disable-libsuffix --program-prefix=''
+TAGLIB_CONF_OPT = --disable-libsuffix
 
 define TAGLIB_REMOVE_DEVFILE
 	rm -f $(TARGET_DIR)/usr/bin/taglib-config
Signature · 1 line
1.7.2.5
author
#3 lore raw

PATCH 4/22 dbus-glib: remove --program-prefix

In reply to Yann E. MORIN

--program-prefix is now set in the auto-target infrastructure.

Signed-off-by "Yann E. MORIN" <[email protected]>
---
 package/dbus-glib/dbus-glib.mk |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)
package/dbus-glib/dbus-glib.mk +0 -1
index 6058b23..7c4e65b 100644
@@ -13,7 +13,6 @@ DBUS_GLIB_CONF_ENV = ac_cv_have_abstract_sockets=yes \
 		have_abstract_sockets=yes
 
 DBUS_GLIB_CONF_OPT = --localstatedir=/var \
-		--program-prefix="" \
 		--disable-tests \
 		--disable-xml-docs \
 		--with-introspect-xml=$(DBUS_HOST_INTROSPECT) \
Signature · 1 line
1.7.2.5
author
#4 lore raw

PATCH 5/22 fakeroot: remove --program-prefix

In reply to Yann E. MORIN

--program-prefix is now set in the auto-target infrastructure.

Signed-off-by "Yann E. MORIN" <[email protected]>
---
 package/fakeroot/fakeroot.mk |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)
package/fakeroot/fakeroot.mk +0 -1
index 29e9e5b..1271e7c 100644
@@ -6,7 +6,6 @@
 FAKEROOT_VERSION:=1.9.5
 FAKEROOT_SOURCE:=fakeroot_$(FAKEROOT_VERSION).tar.gz
 FAKEROOT_SITE:=http://snapshot.debian.org/archive/debian/20080427T000000Z/pool/main/f/fakeroot/
-FAKEROOT_CONF_OPT = --program-prefix=''
 
 define FAKEROOT_PATCH_FAKEROOT_IN
 	# If using busybox getopt, make it be quiet.
Signature · 1 line
1.7.2.5
author
#5 lore raw

PATCH 6/22 jpeg: remove --program-prefix

In reply to Yann E. MORIN

--program-prefix is now set in the auto-target infrastructure.

Signed-off-by "Yann E. MORIN" <[email protected]>
---
 package/jpeg/jpeg.mk |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)
package/jpeg/jpeg.mk +0 -1
index 30a6225..adbe330 100644
@@ -8,7 +8,6 @@ JPEG_SITE = http://www.ijg.org/files/
 JPEG_SOURCE = jpegsrc.v$(JPEG_VERSION).tar.gz
 JPEG_INSTALL_STAGING = YES
 JPEG_INSTALL_TARGET = YES
-JPEG_CONF_OPT = --program-prefix=
 
 define JPEG_REMOVE_USELESS_TOOLS
 	rm -f $(addprefix $(TARGET_DIR)/usr/bin/,cjpeg djpeg jpegtrans rdjpgcom wrjpgcom)
Signature · 1 line
1.7.2.5
author
#6 lore raw

PATCH 7/22 sylpheed: remove --program-prefix

In reply to Yann E. MORIN

--program-prefix is now set in the auto-target infrastructure.

Signed-off-by "Yann E. MORIN" <[email protected]>
---
 package/sylpheed/sylpheed.mk |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
package/sylpheed/sylpheed.mk +1 -1
index dbd2408..371341f 100644
@@ -9,7 +9,7 @@ SYLPHEED_VERSION = $(SYLPHEED_VERSION_MAJOR).$(SYLPHEED_VERSION_MINOR)
 SYLPHEED_SOURCE = sylpheed-$(SYLPHEED_VERSION).tar.bz2
 SYLPHEED_SITE = http://sylpheed.sraoss.jp/sylpheed/v$(SYLPHEED_VERSION_MAJOR)
 
-SYLPHEED_CONF_OPT = --disable-gtkspell --program-prefix="" \
+SYLPHEED_CONF_OPT = --disable-gtkspell \
                     --includedir=$(STAGING_DIR)/usr/include
 
 SYLPHEED_DEPENDENCIES = host-pkg-config libgtk2
Signature · 1 line
1.7.2.5
author
#7 lore raw

PATCH 8/22 sdl_sound: remove --program-prefix

In reply to Yann E. MORIN

--program-prefix is now set in the auto-target infrastructure.

Signed-off-by "Yann E. MORIN" <[email protected]>
---
 package/sdl_sound/sdl_sound.mk |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)
package/sdl_sound/sdl_sound.mk +1 -2
index 8f51e05..0a0fe5b 100644
@@ -31,8 +31,7 @@ SDL_SOUND_CONF_OPT = \
 	--with-sdl-prefix=$(STAGING_DIR)/usr \
 	--with-sdl-exec-prefix=$(STAGING_DIR)/usr \
 	--disable-sdltest \
-	--enable-static \
-	--program-prefix=''
+	--enable-static
 
 # enable mmx for newer x86's
 ifeq ($(BR2_i386)$(BR2_x86_i386)$(BR2_x86_i486)$(BR2_x86_i586)$(BR2_x86_pentiumpro)$(BR2_x86_geode),y)
Signature · 1 line
1.7.2.5
author
#8 lore raw

PATCH 9/22 lzop: remove --program-prefix

In reply to Yann E. MORIN

--program-prefix is now set in the auto-target infrastructure.

Signed-off-by "Yann E. MORIN" <[email protected]>
---
 package/lzop/lzop.mk |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)
package/lzop/lzop.mk +0 -1
index 796686a..e55c105 100644
@@ -6,7 +6,6 @@
 LZOP_VERSION:=1.02rc1
 LZOP_SOURCE:=lzop-$(LZOP_VERSION).tar.gz
 LZOP_SITE:=http://www.lzop.org/download/
-LZOP_CONF_OPT:=--program-prefix=""
 LZOP_DEPENDENCIES:=lzo
 
 $(eval $(call AUTOTARGETS,package,lzop))
Signature · 1 line
1.7.2.5
author
#9 lore raw

PATCH 10/22 netcat: remove --program-prefix

In reply to Yann E. MORIN

--program-prefix is now set in the auto-target infrastructure.

Signed-off-by "Yann E. MORIN" <[email protected]>
---
 package/netcat/netcat.mk |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)
package/netcat/netcat.mk +0 -1
index f8263ef..31f6b71 100644
@@ -10,6 +10,5 @@ NETCAT_SITE=http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/netc
 NETCAT_AUTORECONF:=NO
 NETCAT_INSTALL_STAGING:=NO
 NETCAT_INSTALL_TARGET:=YES
-NETCAT_CONF_OPT = --program-prefix=''
 
 $(eval $(call AUTOTARGETS,package,netcat))
Signature · 1 line
1.7.2.5
author
#10 lore raw

PATCH 11/22 fbdump: remove --program-prefix

In reply to Yann E. MORIN

--program-prefix is now set in the auto-target infrastructure.

Signed-off-by "Yann E. MORIN" <[email protected]>
---
 package/fbdump/fbdump.mk |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)
package/fbdump/fbdump.mk +0 -1
index eb74d8b..521b0fd 100644
@@ -7,7 +7,6 @@ FBDUMP_VERSION:=0.4.2
 FBDUMP_SOURCE:=fbdump-$(FBDUMP_VERSION).tar.gz
 FBDUMP_SITE:=http://www.rcdrummond.net/fbdump
 FBDUMP_AUTORECONF = NO
-FBDUMP_CONF_OPT = --program-prefix=''
 
 $(eval $(call AUTOTARGETS,package,fbdump))
Signature · 1 line
1.7.2.5
author
#11 lore raw

PATCH 12/22 mysql_client: remove --program-prefix

In reply to Yann E. MORIN

--program-prefix is now set in the auto-target infrastructure.

Signed-off-by "Yann E. MORIN" <[email protected]>
---
 package/mysql_client/mysql_client.mk |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)
package/mysql_client/mysql_client.mk +0 -1
index 9cd088c..49a7033 100644
@@ -21,7 +21,6 @@ MYSQL_CLIENT_CONF_ENV = \
 	mysql_cv_new_rl_interface=yes
 
 MYSQL_CLIENT_CONF_OPT = \
-	--program-prefix="" \
 	--without-ndb-binlog \
 	--without-server \
 	--without-docs \
Signature · 1 line
1.7.2.5
author
#12 lore raw

PATCH 13/22 ntfsprogs: remove --program-prefix

In reply to Yann E. MORIN

--program-prefix is now set in the auto-target infrastructure.

Signed-off-by "Yann E. MORIN" <[email protected]>
---
 package/ntfsprogs/ntfsprogs.mk |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
package/ntfsprogs/ntfsprogs.mk +1 -1
index 4557747..ea8a2a4 100644
@@ -6,7 +6,7 @@
 NTFSPROGS_VERSION:=2.0.0
 NTFSPROGS_SOURCE:=ntfsprogs-$(NTFSPROGS_VERSION).tar.gz
 NTFSPROGS_SITE:=http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/linux-ntfs/
-NTFSPROGS_CONF_OPT:=--disable-gnome-vfs --program-prefix="" --disable-crypto
+NTFSPROGS_CONF_OPT:=--disable-gnome-vfs --disable-crypto
 NTFSPROGS_INSTALL_STAGING:=yes
 
 NTFSPROGS_BIN:=ntfscat ntfscluster ntfscmp ntfsfix ntfsinfo ntfsls
Signature · 1 line
1.7.2.5
author
#13 lore raw

PATCH 14/22 lighttpd: remove --program-prefix

In reply to Yann E. MORIN

--program-prefix is now set in the auto-target infrastructure.

Signed-off-by "Yann E. MORIN" <[email protected]>
---
 package/lighttpd/lighttpd.mk |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)
package/lighttpd/lighttpd.mk +0 -1
index 45941eb..ba5f5cf 100644
@@ -11,7 +11,6 @@ LIGHTTPD_CONF_OPT = \
 	--libdir=/usr/lib/lighttpd \
 	--libexecdir=/usr/lib \
 	--localstatedir=/var \
-	--program-prefix="" \
 	$(if $(BR2_LARGEFILE),,--disable-lfs)
 
 ifeq ($(BR2_PACKAGE_LIGHTTPD_OPENSSL),y)
Signature · 1 line
1.7.2.5
author
#14 lore raw

PATCH 15/22 gamin: remove --program-prefix

In reply to Yann E. MORIN

--program-prefix is now set in the auto-target infrastructure.

Signed-off-by "Yann E. MORIN" <[email protected]>
---
 package/gamin/gamin.mk |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
package/gamin/gamin.mk +1 -1
index d691f60..326fd62 100644
@@ -9,7 +9,7 @@ GAMIN_SITE = http://www.gnome.org/~veillard/gamin/sources
 GAMIN_AUTORECONF = YES
 GAMIN_INSTALL_STAGING = YES
 
-GAMIN_CONF_OPT = --program-prefix="" --disable-debug
+GAMIN_CONF_OPT = --disable-debug
 
 # python support broken
 GAMIN_CONF_OPT += --without-python
Signature · 1 line
1.7.2.5
author
#15 lore raw

PATCH 16/22 ntfs-3g: remove --program-prefix

In reply to Yann E. MORIN

--program-prefix is now set in the auto-target infrastructure.

Signed-off-by "Yann E. MORIN" <[email protected]>
---
 package/ntfs-3g/ntfs-3g.mk |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
package/ntfs-3g/ntfs-3g.mk +1 -1
index 796e269..baabff2 100644
@@ -7,7 +7,7 @@
 NTFS_3G_VERSION = 2010.10.2
 NTFS_3G_SOURCE = ntfs-3g-$(NTFS_3G_VERSION).tgz
 NTFS_3G_SITE = http://tuxera.com/opensource
-NTFS_3G_CONF_OPT = --disable-ldconfig --program-prefix=""
+NTFS_3G_CONF_OPT = --disable-ldconfig
 NTFS_3G_INSTALL_STAGING = YES
 
 $(eval $(call AUTOTARGETS,package,ntfs-3g))
Signature · 1 line
1.7.2.5
author
#16 lore raw

PATCH 17/22 libargtable2: remove --program-prefix

In reply to Yann E. MORIN

--program-prefix is now set in the auto-target infrastructure.

Signed-off-by "Yann E. MORIN" <[email protected]>
---
 package/libargtable2/libargtable2.mk |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)
package/libargtable2/libargtable2.mk +1 -2
index 5f388f9..4241e73 100644
@@ -9,8 +9,7 @@ LIBARGTABLE2_SOURCE = argtable2-$(LIBARGTABLE2_VERSION).tar.gz
 LIBARGTABLE2_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/argtable/
 
 LIBARGTABLE2_INSTALL_STAGING = YES
-LIBARGTABLE2_CONF_OPT= --program-prefix="" \
-		--disable-example \
+LIBARGTABLE2_CONF_OPT= --disable-example \
 		--disable-kernel-module \
 		--enable-lib \
 		--enable-util
Signature · 1 line
1.7.2.5
author
#17 lore raw

PATCH 18/22 fuse: remove --program-prefix

In reply to Yann E. MORIN

--program-prefix is now set in the auto-target infrastructure.

Signed-off-by "Yann E. MORIN" <[email protected]>
---
 package/fuse/libfuse.mk |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)
package/fuse/libfuse.mk +1 -2
index 13a5194..45fb2f3 100644
@@ -9,8 +9,7 @@ LIBFUSE_SOURCE = fuse-$(LIBFUSE_VERSION).tar.gz
 LIBFUSE_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/fuse/
 
 LIBFUSE_INSTALL_STAGING = YES
-LIBFUSE_CONF_OPT= --program-prefix="" \
-		--disable-nls \
+LIBFUSE_CONF_OPT= --disable-nls \
 		--disable-example \
 		--disable-kernel-module \
 		--enable-lib \
Signature · 1 line
1.7.2.5
author
#18 lore raw

PATCH 19/22 dbus: remove --program-prefix

In reply to Yann E. MORIN

--program-prefix is now set in the auto-target infrastructure.

Signed-off-by "Yann E. MORIN" <[email protected]>
---
 package/dbus/dbus.mk |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)
package/dbus/dbus.mk +1 -2
index 7c2bddd..d693039 100644
@@ -12,8 +12,7 @@ DBUS_INSTALL_TARGET = YES
 DBUS_DEPENDENCIES = host-pkg-config
 
 DBUS_CONF_ENV = ac_cv_have_abstract_sockets=yes
-DBUS_CONF_OPT = --program-prefix="" \
-		--with-dbus-user=dbus \
+DBUS_CONF_OPT = --with-dbus-user=dbus \
 		--disable-tests \
 		--disable-asserts \
 		--enable-abstract-sockets \
Signature · 1 line
1.7.2.5
author
#19 lore raw

PATCH 20/22 tcpreplay: remove --program-prefix

In reply to Yann E. MORIN

--program-prefix is now set in the auto-target infrastructure.

Signed-off-by "Yann E. MORIN" <[email protected]>
---
 package/tcpreplay/tcpreplay.mk |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
package/tcpreplay/tcpreplay.mk +1 -1
index f82867c..296f4eb 100644
@@ -7,7 +7,7 @@
 TCPREPLAY_VERSION = 3.4.3
 TCPREPLAY_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/tcpreplay
 TCPREPLAY_CONF_ENV = tr_cv_libpcap_version=">= 0.7.0"
-TCPREPLAY_CONF_OPT = --program-prefix="" --with-libpcap=$(STAGING_DIR)/usr
+TCPREPLAY_CONF_OPT = --with-libpcap=$(STAGING_DIR)/usr
 
 TCPREPLAY_DEPENDENCIES = uclibc libpcap
Signature · 1 line
1.7.2.5
author
#20 lore raw

PATCH 21/22 diretcfb: remove --program-prefix

In reply to Yann E. MORIN

--program-prefix is now set in the auto-target infrastructure.

Signed-off-by "Yann E. MORIN" <[email protected]>
---
 package/directfb/directfb.mk |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)
package/directfb/directfb.mk +0 -1
index 5af65d7..5e05451 100644
@@ -12,7 +12,6 @@ DIRECTFB_INSTALL_STAGING = YES
 DIRECTFB_CONF_OPT = \
 	--localstatedir=/var \
 	--disable-explicit-deps \
-	--program-prefix='' \
 	--enable-zlib \
 	--enable-freetype \
 	--enable-fbdev \
Signature · 1 line
1.7.2.5
author
#21 lore raw

PATCH 22/22 radvd: remove --program-prefix

In reply to Yann E. MORIN

--program-prefix is now set in the auto-target infrastructure.

Signed-off-by "Yann E. MORIN" <[email protected]>
---
 package/radvd/radvd.mk |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)
package/radvd/radvd.mk +0 -1
index fe8be5d..6b7468a 100644
@@ -7,7 +7,6 @@ RADVD_VERSION:=1.6
 RADVD_SOURCE:=radvd-$(RADVD_VERSION).tar.gz
 RADVD_SITE:=http://www.litech.org/radvd/dist/
 RADVD_DEPENDENCIES:=flex host-flex
-RADVD_CONF_OPT:= --program-prefix=''
 
 define RADVD_INSTALL_INITSCRIPT
 	$(INSTALL) -m 0755 package/radvd/S50radvd $(TARGET_DIR)/etc/init.d
Signature · 1 line
1.7.2.5
#22 lore raw

PATCH 1/22 Makefile: auto-target automatically pass --program-prefix=""

In reply to Yann E. MORIN
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Yann" == Yann E MORIN <[email protected]> writes:

Yann> When cross-compiled, some packages incorrectly prefix their executables Yann> with the target tuple.

Yann> Fix that by forcing the program prefix to the empty string when calling Yann> ./configure, but only when compiling for target, not for host.

Committed entire series, thanks!

Signature · 1 line
Bye, Peter Korsgaard