* [Buildroot] svn commit: trunk/buildroot/package: audio/libogg audio/libvorbis docker edit etc...
@ 2008-10-26 6:19 jacmet at uclibc.org
2008-10-26 12:57 ` Markus Heidelberg
2008-10-26 13:37 ` Markus Heidelberg
0 siblings, 2 replies; 8+ messages in thread
From: jacmet at uclibc.org @ 2008-10-26 6:19 UTC (permalink / raw)
To: buildroot
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) \
^ permalink raw reply [flat|nested] 8+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package: audio/libogg audio/libvorbis docker edit etc...
2008-10-26 12:57 ` Markus Heidelberg
@ 2008-10-26 12:13 ` Peter Korsgaard
0 siblings, 0 replies; 8+ messages in thread
From: Peter Korsgaard @ 2008-10-26 12:13 UTC (permalink / raw)
To: buildroot
>>>>> "Markus" == Markus Heidelberg <markus.heidelberg@web.de> writes:
Markus> This lets configure abort at the compiler check, patch below.
Sorry about that, committed as r23800.
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 8+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package: audio/libogg audio/libvorbis docker edit etc...
2008-10-26 6:19 [Buildroot] svn commit: trunk/buildroot/package: audio/libogg audio/libvorbis docker edit etc jacmet at uclibc.org
@ 2008-10-26 12:57 ` Markus Heidelberg
2008-10-26 12:13 ` Peter Korsgaard
2008-10-26 13:37 ` Markus Heidelberg
1 sibling, 1 reply; 8+ messages in thread
From: Markus Heidelberg @ 2008-10-26 12:57 UTC (permalink / raw)
To: buildroot
jacmet at uclibc.org, 26.10.2008:
> 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/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)" \
This lets configure abort at the compiler check, patch below.
> 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) \
---
package/editors/vim/vim.mk | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/package/editors/vim/vim.mk b/package/editors/vim/vim.mk
index a9d79ed..826e3c7 100644
--- a/package/editors/vim/vim.mk
+++ b/package/editors/vim/vim.mk
@@ -36,11 +36,12 @@ $(VIM_DIR)/.patched: $(VIM_DIR)/.unpacked
$(VIM_DIR)/.configured: $(VIM_DIR)/.patched
(cd $(VIM_DIR)/src; \
+ $(TARGET_CONFIGURE_OPTS) \
+ $(TARGET_CONFIGURE_ARGS) \
CFLAGS="$(TARGET_CFLAGS)" \
STRIP="$(TARGET_STRIP)" \
PKG_CONFIG_ALLOW_SYSTEM_CFLAGS=1 \
PKG_CONFIG_ALLOW_SYSTEM_LIBS=1 \
- $(TARGET_CONFIGURE_ARGS) \
./configure --prefix=/usr \
--target=$(GNU_TARGET_NAME) \
--host=$(GNU_TARGET_NAME) \
--
1.5.6.4
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package: audio/libogg audio/libvorbis docker edit etc...
2008-10-26 6:19 [Buildroot] svn commit: trunk/buildroot/package: audio/libogg audio/libvorbis docker edit etc jacmet at uclibc.org
2008-10-26 12:57 ` Markus Heidelberg
@ 2008-10-26 13:37 ` Markus Heidelberg
2008-10-26 18:10 ` Markus Heidelberg
2008-10-26 19:30 ` Peter Korsgaard
1 sibling, 2 replies; 8+ messages in thread
From: Markus Heidelberg @ 2008-10-26 13:37 UTC (permalink / raw)
To: buildroot
jacmet at uclibc.org, 26.10.2008:
> 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
>
>
> 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"
I think this will break docker, because MAKE_OPT is affected, not CONF_OPT.
And I just noticed that docker doesn't use autotools at all.
Markus
^ permalink raw reply [flat|nested] 8+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package: audio/libogg audio/libvorbis docker edit etc...
2008-10-26 13:37 ` Markus Heidelberg
@ 2008-10-26 18:10 ` Markus Heidelberg
2008-10-26 19:30 ` Peter Korsgaard
1 sibling, 0 replies; 8+ messages in thread
From: Markus Heidelberg @ 2008-10-26 18:10 UTC (permalink / raw)
To: buildroot
Markus Heidelberg, 26.10.2008:
> > 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"
>
> I think this will break docker, because MAKE_OPT is affected, not CONF_OPT.
> And I just noticed that docker doesn't use autotools at all.
Ah, already fixed in a later commit.
Markus
^ permalink raw reply [flat|nested] 8+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package: audio/libogg audio/libvorbis docker edit etc...
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
1 sibling, 1 reply; 8+ messages in thread
From: Peter Korsgaard @ 2008-10-26 19:30 UTC (permalink / raw)
To: buildroot
>>>>> "Markus" == Markus Heidelberg <markus.heidelberg@web.de> writes:
Hi,
>> - 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"
Markus> I think this will break docker, because MAKE_OPT is affected,
Markus> not CONF_OPT. And I just noticed that docker doesn't use
Markus> autotools at all.
Yes, I re-added PKG_CONFIG=.. in r23796 - With that, it works for me.
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 8+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package: audio/libogg audio/libvorbis docker edit etc...
2008-10-26 19:30 ` Peter Korsgaard
@ 2008-10-27 6:59 ` Markus Heidelberg
2008-10-27 9:12 ` Peter Korsgaard
0 siblings, 1 reply; 8+ messages in thread
From: Markus Heidelberg @ 2008-10-27 6:59 UTC (permalink / raw)
To: buildroot
Peter Korsgaard, 26.10.2008:
> >>>>> "Markus" == Markus Heidelberg <markus.heidelberg@web.de> writes:
>
> Hi,
>
> >> - 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"
>
> Markus> I think this will break docker, because MAKE_OPT is affected,
> Markus> not CONF_OPT. And I just noticed that docker doesn't use
> Markus> autotools at all.
>
> Yes, I re-added PKG_CONFIG=.. in r23796 - With that, it works for me.
After looking into it again, the package seems a bit broken. `$(PKG_CONFIG)
--cflags glib-2.0` evaluates to "-I/usr/include/glib-2.0
-I/usr/lib/glib-2.0/include", not the ones in staging_dir, so it uses the
system include files. PKG_CONFIG_PATH has to be defined and
PKG_CONFIG_SYSROOT_DIR, too. But it also uses the staging files hardcoded in
the Makefile. Then have a look at XLIBPATH in the Makefile, which points to
the system files. And LDFLAGS is never used.
Markus
^ permalink raw reply [flat|nested] 8+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package: audio/libogg audio/libvorbis docker edit etc...
2008-10-27 6:59 ` Markus Heidelberg
@ 2008-10-27 9:12 ` Peter Korsgaard
0 siblings, 0 replies; 8+ messages in thread
From: Peter Korsgaard @ 2008-10-27 9:12 UTC (permalink / raw)
To: buildroot
>>>>> "Markus" == Markus Heidelberg <markus.heidelberg@web.de> writes:
Hi,
Markus> After looking into it again, the package seems a bit
Markus> broken. `$(PKG_CONFIG) --cflags glib-2.0` evaluates to
Markus> "-I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include", not
Markus> the ones in staging_dir, so it uses the system include
Markus> files. PKG_CONFIG_PATH has to be defined and
Markus> PKG_CONFIG_SYSROOT_DIR, too. But it also uses the staging
Markus> files hardcoded in the Makefile. Then have a look at XLIBPATH
Markus> in the Makefile, which points to the system files. And
Markus> LDFLAGS is never used.
Yeah, the docker build system seems pretty broken :/
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2008-10-27 9:12 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-10-26 6:19 [Buildroot] svn commit: trunk/buildroot/package: audio/libogg audio/libvorbis docker edit etc jacmet at uclibc.org
2008-10-26 12:57 ` 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
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox