Commit Graph

106 Commits

Author SHA1 Message Date
Thomas Petazzoni
74ecbaa23d xorg: remove the XSERVER variable
The XSERVER variable used to be defined by package/Makefile.in because
the X server package name was different depending on the type of X
server that was choosen. Nowadays, the name of the package is always
xserver_xorg-server, so there's no point in having this XSERVER
intermediate variable.

This patch makes all packages use xserver_xorg-server directly as a
dependency, and removes the XSERVER variable from package/Makefile.in.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2009-07-24 23:26:48 +02:00
Thomas Petazzoni
6beeb755fa xorg: use BR2_PACKAGE_XORG instead of BR2_PACKAGE_XSERVER_none
The BR2_PACKAGE_XSERVER_none option has gone, so use BR2_PACKAGE_XORG7
instead. It is more logical to test if BR2_PACKAGE_XORG7 is set to
know if an X.org server is available, than testing if
BR2_PACKAGE_XSERVER_none is set to know if an X.org server is *not*
available.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2009-07-24 23:26:47 +02:00
Thomas Petazzoni
cc76043bd4 xorg: simplify dependencies on X.org
Many packages used to depend on BR2_PACKAGE_XORG||BR2_PACKAGE_XORG7,
but this is useless since BR2_PACKAGE_XORG is a non-existing
configuration option. So, these depencies gets simplified to
BR2_PACKAGE_XORG7 only.

Some others were depending on BR2_PACKAGE_TINYX (which doesn't) exist
or BR2_PACKAGE_XSERVER_xorg || BR2_PACKAGE_XSERVER_tiny ||
BR2_PACKAGE_XSERVER_x11r7. Replace all that mess by a simple
dependency on BR2_PACKAGE_XORG7.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2009-07-17 14:34:22 +02:00
Peter Korsgaard
91149af9f3 package: provide download target for host packages 2009-03-24 10:58:04 +00:00
Peter Korsgaard
90ac14b2a0 avahi: gtk support needs libglade as well 2009-03-19 11:41:05 +00:00
Peter Korsgaard
e7b38c71ce package: add STAMP_DIR and use for host builds
Move stamp (dependency) files outside the (version specific) source
directories, so other packages can hardcode dependencies on them instead
of having to use <PACKAGE>_VERSION variables.

This is important as the variables in the make rules are evaluated when
the rules is seen, which might be before the dependent makefile is parsed
(and hence <PACKAGE>_VERSION variable is known, screwing up stuff.

The downside of this is that the package isn't automatically rebuilt
when the version changes (E.G. by a svn update) and you now also have to
remove the stamp files next to $(BUILD_DIR)/<PACKAGE>-* to force a rebuild.
2009-03-19 11:06:47 +00:00
Peter Korsgaard
849c45648d pkg-config: rename pkgconfig to pkg-config
This matches upstream tarball, doesn't screw up existing .config's with
BR2_PACKAGE_PKGCONFIG and makes sure the patch gets applied for target
compilation.
2009-03-19 08:30:20 +00:00
Peter Korsgaard
99334cde2b libgtk2: build host version, use it for build time binaries 2009-03-18 21:22:17 +00:00
Peter Korsgaard
77754571b2 pkgconfig: add pkgconfig package for target
The host versions shouldn't be visible in Kconfig, so remove the
reference to BR2_PACKAGE_PKGCONFIG everywhere and prefix the host targets
with host-.

At the same time add pkgconfig for the target (E.G. for development) and
let BR2_PACKAGE_PKGCONFIG control that package.

Notice: all defconfigs in the tree have been updated, but make sure to
disable the pkgconfig package (unless you want it) if you use an external
config, otherwise you'll end up with pkgconfig and glib2 in the target.
2009-03-18 19:19:10 +00:00
Peter Korsgaard
dba1efdfc6 libgtk2: small cleanup 2009-03-16 20:58:01 +00:00
Peter Korsgaard
49a455645e libgtk2: init script: make sure /etc/gtk-2.0 exists 2009-03-16 15:49:11 +00:00
Peter Korsgaard
01bcd0320e libglib2: build host version for build-time binaries
Build host version of glib in HOST_DIR and use the build-time binaries
from there instead of relying on what is installed on the host.
2009-03-16 15:49:03 +00:00
Peter Korsgaard
e239f92a17 libgtk2: also get rid of gtk-demo executable 2009-03-12 12:32:11 +00:00
Peter Korsgaard
bcbd144287 cairo: more fine grained configutation and fix dependencies 2009-03-12 10:21:21 +00:00
Peter Korsgaard
2395d4ccc5 libgtk2: don't install demo sources 2009-03-11 10:10:54 +00:00
Ulf Samuelsson
6ce30eef5a Cleanup libgtk2, and prepare for 2.15 2009-01-18 10:57:23 +00:00
Thomas Lundquist
c86f23b770 Getting rid of a bit more configure options that's been centralized. 2009-01-18 09:26:28 +00:00
Thomas Lundquist
6b00041b87 Finish the gtk-doc stuff and start on the smae thing with LARGEFILE and NLS. 2009-01-18 00:05:57 +00:00
Thomas Lundquist
fa2273f409 Easier with one place for configure options for disabling gtk-doc 2009-01-17 10:11:12 +00:00
Ulf Samuelsson
0267841fe5 Force use of HOST_GLIB instead of /usr/bin for libgtk2 2009-01-14 22:11:13 +00:00
Peter Korsgaard
ccb02b009b libgtk2: add init script to create /etc/gtk-2.0/gdk-pixbuf.loaders
It would be nicer to do this at compile time, but then we would need to
compile libgtk2 for the host as well.
2008-12-31 09:35:15 +00:00
Peter Korsgaard
87e333010c libgtk: don't list cups/png/jpeg/tiff as hard dependencies
GTK can be compiled without the above, so don't list them as hard
dependencies, and simply adjust the build depending on what the user
has enabled.
2008-12-26 15:36:12 +00:00
Peter Korsgaard
5c3a6a55e6 libgtk2: remove unneeded configure opts
This stuff is all handled by Makefile.autotools.in
2008-12-26 15:36:09 +00:00
Daniel Laird
5432f26f0e Adding Central config.cache options
The following changes allow for use of a central configure cache
file.  This speeds up configuration of packages.
Its use is configurable at the top level (BR2_CONFIG_CACHE - default n).
Old style makefiles can use it if they use the following MACRO in makefiles:
$(AUTO_CONFIGURE_TARGET) see my change to directfb.mk.
New style Autotools.in will use it if you set the global option.
However you can enable the global option and on a per package overrule it by doing
the following: $(PKGNAME)_USE_CONFIG_CACHE = NO see fontconfig.mk for an example 
of this.
Finally I have removed a few config variable settings which indicated no CXX compiler
as this is wrong and breaks the build when using this central cache.

 Config.in                        |    8 ++++++++
 package/Makefile.autotools.in    |    5 ++++-
 package/Makefile.in              |   28 +++++++++++++++++++++++++++-
 package/atk/atk.mk               |    2 +-
 package/directfb/directfb.mk     |    7 +------
 package/fontconfig/fontconfig.mk |    3 +++
 package/libglib2/libglib2.mk     |    2 +-
 package/libgtk2/libgtk2.mk       |    1 -
 8 files changed, 45 insertions(+), 11 deletions(-)

I would appreciate feedback on this change (I have been testing for 2-3 weeks)
But I can never test all cases!  If you enable the BR2_CONFIG_CACHE option some
Makefile.autotools.in based packages may now break - I cannot build them all.
In this case you may need to remove config options that are being hardcoded all
over the place (like gtk saying we have 2 CXX compiler) or disable the use
of CONFIG CACHE file like I have done in fontconfig.
I can build all packages required to get WebKit on DirectFB up and running
and it runs fine.
I will try to resolve any issues this creates as fast as I can.

Signed-off-by: Daniel Laird <daniel.j.laird@nxp.com>
2008-11-28 14:20:47 +00:00
Peter Korsgaard
cab350013e libpng: fix Makefile.autotools.in fallout
libpng used to have the 'png' Makefile alias, which some packages used
in their dependencies list.

With the move to Makefile.autotools.in this is now gone, so update the
packages to match.
2008-11-02 19:21:17 +00:00
Peter Korsgaard
c8f70347ec Strip libgtk2 in the target
Rely on the sane default values of Makefile.autotools.in for the
staging and target installs. The immediate benefit is that the target
install will use install-strip instead of install, leading to a quite
nice size reduction in the libraries.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2008-10-27 09:45:41 +00:00
Peter Korsgaard
da39abf0cc Bump up libgtk2 version
Bump up libgtk2 version

The version of libgtk2 currently used doesn't build when built against
DirectFB. The issue has been fixed in a later version of the 2.12.x
series, so let's upgrade to this version.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2008-10-18 07:00:35 +00:00
Daniel Laird
d2f7a4abe8 select CUPS if XORG/XORG7/TINYX.
This makes the behaviour the same as before for X users. 
Although is CUPS a necessary dependancy?

Daniel Laird
2008-08-26 13:45:39 +00:00
Daniel Laird
b46a591b91 The changes below add better support for DirectFB and libgtk2.
Should be no different for X builds.

 Config.in  |    3 +--
 libgtk2.mk |    7 +++----
 2 files changed, 4 insertions(+), 6 deletions(-)

Signed-off-by: daniel.j.laird@nxp.com

package/libgtk2/Config.in
Allow DirectFB to turn on LIBGTK2 support without X being enabled.
Disable autoselection of cups.  May not be wanted (Can cause crosscompilation issues).

package/libgtk2/libgtk2.mk
Remove unnessary redefine of PKG_CONFIG_*
Pass $(DISABLE_LARGEFILE) to configure (supports large file or not)
Move 'cups' to X extra dependencies instead of general.
2008-08-26 12:19:29 +00:00
Peter Korsgaard
02a623ddf9 buildroot: remove trailing spaces
for i in `find -name 'Config*' -o -name 'Makefile*' -o -name '*.mk'`;
do
	sed -i 's/ \+$//' $i;
done
2008-08-04 19:07:05 +00:00
Peter Korsgaard
4683420c4c Kconfig: remove 'default n'
'default n' is the default, so there's no need to say it explicitly.
2008-07-17 20:01:44 +00:00
Ulf Samuelsson
b201c69426 Support ARCH-unknown-linux-gnu, Use target library paths instead of the host library paths. 2008-07-08 10:09:28 +00:00
Ulf Samuelsson
13a88249e5 Remove duplicated select LIBPNG and use alphabetical order for selects 2008-07-07 11:09:20 +00:00
Ulf Samuelsson
41d4fe921d Improve readability of libgtk2 configuration 2008-07-06 06:25:06 +00:00
Ulf Samuelsson
1a75be4d73 Use HOST_GLIB for packages 2008-07-05 09:30:17 +00:00
Peter Korsgaard
565e05c8a1 packages: fix pkgconfig depencies and select pkgconfig where needed 2008-06-14 21:01:16 +00:00
John Voltz
f11fa22d0e remove unnecessary libdir-la.patch patches and modify Makefile.autotools.in to patch libtool automatically. 2008-05-01 14:07:11 +00:00
John Voltz
5b5cf3bf36 updated libgtk2 2008-03-06 18:15:42 +00:00
Bernhard Reutner-Fischer
14a71561a3 - just use the strip binary to avoid confusing libtool (quotes)
- use $(STRIPCMD) in packages to avoid clashes with $(STRIP)
2007-10-01 16:15:31 +00:00
Ulf Samuelsson
5f17c052bc Update various packages to make X run 2007-09-12 04:37:31 +00:00
Bernhard Reutner-Fischer
6547bced93 - global whitespace trimming 2007-08-22 12:35:41 +00:00
Bernhard Reutner-Fischer
6c6cb06709 - sed -i -e "/;$/s/;$//g" $(egrep ";$" package/* package/*/*.mk toolchain/* toolchain/*/*.mk */Makefile.in -l) 2007-08-21 19:20:18 +00:00
Ulf Samuelsson
e4ead9c13c Remove switches if sstrip is run 2007-08-21 01:53:57 +00:00
Ulf Samuelsson
a2e5113512 Use STAGING_DIR/usr/lib instead of STAGING_DIR/lib 2007-08-11 22:26:56 +00:00
Ulf Samuelsson
20af51a7d7 Reintroduce dependencies on tinyx for libgtk[1]2 and cairo 2007-08-11 17:03:04 +00:00
Eric Andersen
a7e49eb2af Merge in X11R7 patches from Julien Letessier, posted 04 Jul 2007. Doesn't
quite work yet for me, but this clearly is a huge project and not having it
quite work on the first pass is hardly unexpected.  We definately want this
stuff in buildroot.
2007-08-10 19:07:51 +00:00
Bernhard Reutner-Fischer
74d518dc2a - add endian handling, mmap, memcmp checks to TARGET_CONFIGURE_ARGS
- use TARGET_CONFIGURE_ARGS where appropriate.
2007-06-27 12:01:27 +00:00
Eric Andersen
85d7f6f05f fixup package LDFLAGS handling 2007-03-13 22:59:59 +00:00
Bernhard Reutner-Fischer
4bbeb74b2e - the $(XSERVER) target can be provided by different X server impls. Adjust users
- rdesktop needs an xserver impl
2007-02-04 19:47:41 +00:00
Eric Andersen
9eadb48e9e bump version 2007-02-01 19:19:59 +00:00
Peter Korsgaard
a47fd558f6 PNG package is called BR2_PACKAGE_LIBPNG 2007-01-17 11:27:14 +00:00
Eric Andersen
50deed8023 select XORG rather than depend on it. 2007-01-17 00:04:21 +00:00
Eric Andersen
c199529575 oops, embed $(STAGING_DIR) rather than hard coding my home dir... 2007-01-14 23:27:26 +00:00
Eric Andersen
9524e48516 fix build and ensure we install needed runtime components 2007-01-14 23:26:15 +00:00
Eric Andersen
732d94d25f fixup a whole steaming pile of insanity. When packages are configured,
they should be configured with --prefix=/usr and we then need to use
make DESTDIR=$(STAGING_DIR) install to get things installed into the
staging directory.  The current situation for many packages, which use
--prefix=$(STAGING_DIR) results in the staging_dir paths getting compiled
into the binary itself.

This also adds in a pile of libtool fixups.  Between broken pkgconfig,
broken libtool handling, and broken --prefix settings, its a wonder
things have worked as well as they have up till now.
 -Erik
2007-01-14 03:52:21 +00:00
Eric Andersen
8b9d738e49 add Gtk+ version 2 2007-01-11 08:42:34 +00:00