From: jacmet at uclibc.org <jacmet@uclibc.org>
To: buildroot@busybox.net
Subject: [Buildroot] svn commit: trunk/buildroot/package: audio/libogg audio/libvorbis docker edit etc...
Date: Sat, 25 Oct 2008 23:19:43 -0700 (PDT) [thread overview]
Message-ID: <20081026061944.0F6DE3C2B3@busybox.net> (raw)
Author: jacmet
Date: 2008-10-25 23:19:43 -0700 (Sat, 25 Oct 2008)
New Revision: 23794
Log:
package: cleanup PKG_CONFIG_SYSROOT
PKG_CONFIG_SYSROOT_DIR and friends get set in package/Makefile.in,
so there's no need to set it in the makefiles of the individual
packages as well.
Based on a patch by Markus Heidelberg.
Modified:
trunk/buildroot/package/audio/libogg/libogg.mk
trunk/buildroot/package/audio/libvorbis/libvorbis.mk
trunk/buildroot/package/docker/docker.mk
trunk/buildroot/package/editors/vim/vim.mk
Changeset:
Modified: trunk/buildroot/package/audio/libogg/libogg.mk
===================================================================
--- trunk/buildroot/package/audio/libogg/libogg.mk 2008-10-26 06:03:23 UTC (rev 23793)
+++ trunk/buildroot/package/audio/libogg/libogg.mk 2008-10-26 06:19:43 UTC (rev 23794)
@@ -24,9 +24,6 @@
$(TARGET_CONFIGURE_ARGS) \
$(TARGET_CONFIGURE_OPTS) \
CFLAGS="$(TARGET_CFLAGS)" \
- PKG_CONFIG_PATH="$(STAGING_DIR)/lib/pkconfig:$(STAGING_DIR)/usr/lib/pkgconfig" \
- PKG_CONFIG="$(STAGING_DIR)/usr/bin/pkg-config" \
- PKG_CONFIG_SYSROOT=$(STAGING_DIR) \
./configure \
--target=$(GNU_TARGET_NAME) \
--host=$(GNU_TARGET_NAME) \
Modified: trunk/buildroot/package/audio/libvorbis/libvorbis.mk
===================================================================
--- trunk/buildroot/package/audio/libvorbis/libvorbis.mk 2008-10-26 06:03:23 UTC (rev 23793)
+++ trunk/buildroot/package/audio/libvorbis/libvorbis.mk 2008-10-26 06:19:43 UTC (rev 23794)
@@ -23,9 +23,6 @@
$(TARGET_CONFIGURE_ARGS) \
$(TARGET_CONFIGURE_OPTS) \
CFLAGS="$(TARGET_CFLAGS)" \
- PKG_CONFIG_PATH="$(STAGING_DIR)/lib/pkconfig:$(STAGING_DIR)/usr/lib/pkgconfig" \
- PKG_CONFIG="$(STAGING_DIR)/usr/bin/pkg-config" \
- PKG_CONFIG_SYSROOT=$(STAGING_DIR) \
./configure \
--target=$(GNU_TARGET_NAME) \
--host=$(GNU_TARGET_NAME) \
Modified: trunk/buildroot/package/docker/docker.mk
===================================================================
--- trunk/buildroot/package/docker/docker.mk 2008-10-26 06:03:23 UTC (rev 23793)
+++ trunk/buildroot/package/docker/docker.mk 2008-10-26 06:19:43 UTC (rev 23794)
@@ -14,10 +14,7 @@
CFLAGS="-I$(STAGING_DIR)/usr/include \
-I$(STAGING_DIR)/usr/include/glib-2.0 \
-I$(STAGING_DIR)/usr/lib/glib-2.0/include" \
- LDFLAGS="-L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib" \
- PKGCONFIG="$(STAGING_DIR)/usr/bin/pkg-config" \
- PKG_CONFIG_SYSROOT="$(STAGING_DIR)" \
- PKG_CONFIG_PATH="$(STAGING_DIR)/usr/lib/pkgconfig"
+ LDFLAGS="-L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib"
DOCKER_INSTALL_TARGET_OPT = PREFIX=$(TARGET_DIR)/usr install
Modified: trunk/buildroot/package/editors/vim/vim.mk
===================================================================
--- trunk/buildroot/package/editors/vim/vim.mk 2008-10-26 06:03:23 UTC (rev 23793)
+++ trunk/buildroot/package/editors/vim/vim.mk 2008-10-26 06:19:43 UTC (rev 23794)
@@ -36,14 +36,8 @@
$(VIM_DIR)/.configured: $(VIM_DIR)/.patched
(cd $(VIM_DIR)/src; \
- PATH=$(TARGET_PATH) \
- CC="$(TARGET_CC)" \
- CPP="$(TARGET_CPP)" \
CFLAGS="$(TARGET_CFLAGS)" \
STRIP="$(TARGET_STRIP)" \
- PKG_CONFIG_SYSROOT="$(STAGING_DIR)" \
- PKG_CONFIG="$(STAGING_DIR)/usr/bin/pkg-config" \
- PKG_CONFIG_PATH="$(STAGING_DIR)/usr/lib/pkgconfig:$(PKG_CONFIG_PATH)" \
PKG_CONFIG_ALLOW_SYSTEM_CFLAGS=1 \
PKG_CONFIG_ALLOW_SYSTEM_LIBS=1 \
$(TARGET_CONFIGURE_ARGS) \
next reply other threads:[~2008-10-26 6:19 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-10-26 6:19 jacmet at uclibc.org [this message]
2008-10-26 12:57 ` [Buildroot] svn commit: trunk/buildroot/package: audio/libogg audio/libvorbis docker edit etc Markus Heidelberg
2008-10-26 12:13 ` Peter Korsgaard
2008-10-26 13:37 ` Markus Heidelberg
2008-10-26 18:10 ` Markus Heidelberg
2008-10-26 19:30 ` Peter Korsgaard
2008-10-27 6:59 ` Markus Heidelberg
2008-10-27 9:12 ` Peter Korsgaard
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20081026061944.0F6DE3C2B3@busybox.net \
--to=jacmet@uclibc.org \
--cc=buildroot@busybox.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox