modular: Changes to 'master'
Gaetan Nadon
gnadon at kemper.freedesktop.org
Fri Dec 31 08:20:42 PST 2010
build.sh | 194 ++++++++++++++++++++++++++++++++++++++++++++++-----------------
1 file changed, 143 insertions(+), 51 deletions(-)
New commits:
commit 3d0fba85db9fc79161eb8433e9aa034afbb80acb
Author: Gaetan Nadon <memsize at videotron.ca>
Date: Wed Dec 29 20:52:21 2010 -0500
build.sh: refactor installation directories initialization code
The code is best located in setup_buildenv.
Renamed _SET variables to _USER to emphasis that the purpose
of the variable is to remember that the user had originally
specified a value for the installation directories.
Reviewed-by: Trevor Woerner <twoerner at gmail.com>
Signed-off-by: Gaetan Nadon <memsize at videotron.ca>
commit 20724ef2bb4fabb290da9c80ef3357fcf35fbf2c
Author: Gaetan Nadon <memsize at videotron.ca>
Date: Wed Dec 29 11:28:22 2010 -0500
build.sh: verify PREFIX is a directory and is writable
This will catch the case where user forgets to set PREFIX
and does not have write permission in the /usr/local default location
Reviewed-by: Trevor Woerner <twoerner at gmail.com>
Reviewed-by: Matt Dew <matt at osource.org>
Acked-by: Daniel Stone <daniel at fooishbar.org>
Signed-off-by: Gaetan Nadon <memsize at videotron.ca>
commit 724357db263613f007cc0625d5da79bd49ed913a
Author: Gaetan Nadon <memsize at videotron.ca>
Date: Thu Dec 23 15:36:44 2010 -0500
build.sh: make PREFIX an optional variable as in Autoconf configure
The prefix is optional when configuring a package with autoconf.
The script assumes a value of /usr/local if missing, as configure does.
This makes the usage between build.sh and configure more consistent.
Setting PREFIX in the environment is an alternative to setting prefix
on the command. A reminder that the prefix is not locate the source code
but to specify the base installation directory for binaries, docs, etc...
Reviewed-by: Trevor Woerner <twoerner at gmail.com>
Reviewed-by: Matt Dew <matt at osource.org>
Acked-by: Daniel Stone <daniel at fooishbar.org>
Signed-off-by: Gaetan Nadon <memsize at videotron.ca>
commit 2f35e5383abda8a63da5a70168f12a25e108ac0f
Author: tom fogal <tfogal at sci.utah.edu>
Date: Tue Dec 21 14:10:57 2010 -0700
Add "confflags" option to pass custom config arguments.
This adds an "--confflags" option which will pass its argument on
to every configure (or autogen.sh) script that build.sh runs.
Using this option overrides the existing value of CONFFLAGS
env variable picked-up from the shell environment.
Reviewed-by: Trevor Woerner <twoerner at gmail.com>
Reviewed-by: Matt Dew <matt at osource.org>
Reviewed-by: Tom Fogal <tfogal at alumni.unh.edu>
Acked-by: Daniel Stone <daniel at fooishbar.org>
Signed-off-by: Gaetan Nadon <memsize at videotron.ca>
commit 82d884e293af77171f60d38b9f81bc530b10cc3f
Author: Gaetan Nadon <memsize at videotron.ca>
Date: Tue Dec 21 13:29:39 2010 -0500
build.sh: regroup script main line together
Some lines are interspersed with functions which makes it harder
to understand the script main line code.
Add some comments along the line.
No functional changes.
Reviewed-by: Trevor Woerner <twoerner at gmail.com>
Reviewed-by: Matt Dew <matt at osource.org>
Acked-by: Daniel Stone <daniel at fooishbar.org>
Signed-off-by: Gaetan Nadon <memsize at videotron.ca>
commit 96e84ddb9b868d4de6c3e99107ae8357722627d0
Author: Gaetan Nadon <memsize at videotron.ca>
Date: Thu Dec 16 21:52:25 2010 -0500
build.sh: do not set or document the xserver FONTPATH env variable
This variable was introduced in 2005 at a time where the xserver did
not supply a default value for FONTPATH. Now it does, and it is more
complex that this script handle.
If the variable is set in the build environment by the user, it will continue
to be picked-up by the xserver.
If the variable was set by the script, its incorrect value will no longer
be used by the xserver as it provides a correct default value.
Reviewed-by: Trevor Woerner <twoerner at gmail.com>
Reviewed-by: Matt Dew <matt at osource.org>
Acked-by: Daniel Stone <daniel at fooishbar.org>
Signed-off-by: Gaetan Nadon <memsize at videotron.ca>
commit 11ade11c8aef84560a58e69e426d81b1839f0ae6
Author: Gaetan Nadon <memsize at videotron.ca>
Date: Mon Dec 20 19:29:54 2010 -0500
build.sh: add a note about the portability of the build shell script.
Occasional contributors are unsure about what the portability
requirements are for this script when adding new features.
Reviewed-by: Trevor Woerner <twoerner at gmail.com>
Reviewed-by: Matt Dew <matt at osource.org>
Acked-by: Daniel Stone <daniel at fooishbar.org>
Signed-off-by: Gaetan Nadon <memsize at videotron.ca>
commit 075214904e9f701c88edadfc3680671a9312da52
Author: Gaetan Nadon <memsize at videotron.ca>
Date: Thu Dec 16 15:54:25 2010 -0500
build.sh: document the ACLOCAL env variable to find m4 macros
This is an important variable. If not set, util-macros m4
will not be found and no module can be configured.
Reviewed-by: Trevor Woerner <twoerner at gmail.com>
Reviewed-by: Matt Dew <matt at osource.org>
Acked-by: Daniel Stone <daniel at fooishbar.org>
Signed-off-by: Gaetan Nadon <memsize at videotron.ca>
commit c895b91f9cba8a01aad835b68b77c68572345e47
Author: Gaetan Nadon <memsize at videotron.ca>
Date: Thu Dec 16 13:32:40 2010 -0500
config: add user input checking for *DIR environment variables
Check that the supplied path is a full patch name and not a relative
path name.
Autoconf configure srcipt does the same check:
error: expected an absolute directory name for --libdir: lib
Reviewed-by: Trevor Woerner <twoerner at gmail.com>
Reviewed-by: Matt Dew <matt at osource.org>
Acked-by: Daniel Stone <daniel at fooishbar.org>
Signed-off-by: Gaetan Nadon <memsize at videotron.ca>
commit e893229e3792dd5dd3496786d1cdfa62208c6a60
Author: Gaetan Nadon <memsize at videotron.ca>
Date: Tue Dec 14 11:10:58 2010 -0500
build.sh: allow user to specify an alternate libdir
Modules can be configured with --libdir to provide an alternate
location for object cod libraries. The default value is EPREFIX/lib.
The PKG_CONFIG_PATH, LD_LIBRARY_PATH and FONTPATH are set with
a value of PREFIX/$LIBDIR which does not allow a different prefix
as does the --libdir option.
The meaning of the exisitng LIBDIR is aligned with similar variables
to allow the user to provide a libdir that is not restricted to be
under PREFIX.
If a value other than the default value is used,
the CONFCMD emitted will reflect that with --libdir option.
For environments already having LIBDIR set as a path segment
(e.g. "lib64"), this will no longer work. The next patch will perform
error checking, ensuring all these *DIR variables are full paths
This will also fix the annoyance where the --libdir was always
emitted even if the default value was used.
Reviewed-by: Trevor Woerner <twoerner at gmail.com>
Reviewed-by: Matt Dew <matt at osource.org>
Acked-by: Daniel Stone <daniel at fooishbar.org>
Signed-off-by: Gaetan Nadon <memsize at videotron.ca>
commit 86c2ba192b891b8a0024477a778267ee95106e82
Author: Gaetan Nadon <memsize at videotron.ca>
Date: Mon Dec 13 20:47:01 2010 -0500
build.sh: allow user to specify an alternate localstatedir
Modules can be configured with --localstatedir to provide an alternate
location for modifiable single-machine data.
The log dir was created relative to the hard-coded "var" subdir.
A LOCALSTATEDIR variable is added which uses the "var" default value.
If a value other than the default value is used,
the CONFCMD emitted will reflect that with --localstatedir option.
Reviewed-by: Trevor Woerner <twoerner at gmail.com>
Reviewed-by: Matt Dew <matt at osource.org>
Acked-by: Daniel Stone <daniel at fooishbar.org>
Signed-off-by: Gaetan Nadon <memsize at videotron.ca>
commit 3f223cef336d4292496af92c8b9065eb9e0467b3
Author: Gaetan Nadon <memsize at videotron.ca>
Date: Mon Dec 13 16:53:14 2010 -0500
build.sh: allow user to specify an alternate datadir
Modules can be configured with --datadir to provide an alternate
location for architecture-independent data.
The ACLOCAL dir was created relative to the hard-coded "share" subdir.
Same for PKG_CONFIG_PATH.
A DATAROOTDIR variable is added which provides the "share" default
value to all directories based on it, including DATADIR
A DATADIR variable is added which has DATAROOTDIR as a default value.
If a value other than the default value is used,
the CONFCMD emitted will reflect that with --datadir or -datarootdir option.
There are other directories based on datarootdir but they are not needed
to setup the build environment. Values for these directories can be
passed using CONFFLAGS env variable.
Reviewed-by: Trevor Woerner <twoerner at gmail.com>
Reviewed-by: Matt Dew <matt at osource.org>
Acked-by: Daniel Stone <daniel at fooishbar.org>
Signed-off-by: Gaetan Nadon <memsize at videotron.ca>
commit 4b821a3e67dde3562ac8dc44a40cd68460dbb852
Author: Gaetan Nadon <memsize at videotron.ca>
Date: Mon Dec 13 11:08:33 2010 -0500
build.sh: allow user to specify an alternate bin directory
Any module can be configured with --bindir but the way the PATH
is setup by build.sh does not allow this freedom. It asumes
that the bin subdir will always be under $EPREFIX.
The default value is "bin" under $EPREFIX but that does not mean
that any alternate subdir value must be under $EPREFIX.
The prefix might be /usr but the executables can be under $HOME/bin.
A BINDIR env variable is added which works in a similar way to
PREFIX and EPREFIX. It follows the Autoconf convention.
If a value other than the default value is used,
the CONFCMD emitted will reflect that with --bindir option.
Reviewed-by: Trevor Woerner <twoerner at gmail.com>
Reviewed-by: Matt Dew <matt at osource.org>
Acked-by: Daniel Stone <daniel at fooishbar.org>
Signed-off-by: Gaetan Nadon <memsize at videotron.ca>
commit f504c1b4552fa67d23d8b97d7712830d2f7798f9
Author: Gaetan Nadon <memsize at videotron.ca>
Date: Sun Dec 12 17:57:53 2010 -0500
build.sh: add support for EPREFIX for architecture-dependent files
Follow Autoconf file architecture as there is a PREFIX for
architecture-independent files (config, docs, man) and an EPREFIX
for architecture-dependent files (bin, lib, exe).
This summarizes the architecture-dependent files directories:
EPREFIX:
--bindir=DIR user executables [EPREFIX/bin]
--sbindir=DIR system admin executables [EPREFIX/sbin]
--libexecdir=DIR program executables [EPREFIX/libexec]
--libdir=DIR object code libraries [EPREFIX/lib]
This summarizes the architecture-independent files directories:
PREFIX:
--sysconfdir=DIR read-only single-machine data [PREFIX/etc]
--sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com]
--localstatedir=DIR modifiable single-machine data [PREFIX/var]
--includedir=DIR C header files [PREFIX/include]
--datarootdir=DIR read-only arch.-independent data root [PREFIX/share]
The default value for EPREFIX is PREFIX as explained in the help:
--prefix=PREFIX install architecture-independent files in PREFIX
[/usr/local]
--exec-prefix=EPREFIX install architecture-dependent files in EPREFIX
[PREFIX]
The build.sh script made it impossible to use a value for EPREFIX other
than the default value.
The patch adds the EPREFIX env variable and repleaces PREFIX with EPREFIX
where appropriate. If a value other than the default value is used,
the CONFCMD emitted will reflect that with --exec-prefix option.
Reviewed-by: Trevor Woerner <twoerner at gmail.com>
Reviewed-by: Matt Dew <matt at osource.org>
Acked-by: Daniel Stone <daniel at fooishbar.org>
Signed-off-by: Gaetan Nadon <memsize at videotron.ca>
commit deb117ef1d5700f69ae68c5815a2b8bb4577f557
Author: Gaetan Nadon <memsize at videotron.ca>
Date: Sun Dec 12 17:11:32 2010 -0500
build.sh: expose the PREFIX variable for the user to set
Currently PREFIX is an internal build.sh variable which is used
to emit the --prefix option to all modules.
Make this variable part of the public interface and pick-up the value
from the environment.
That variable is refered to in 6 places in --help but user cannot set it.
Reviewed-by: Trevor Woerner <twoerner at gmail.com>
Reviewed-by: Matt Dew <matt at osource.org>
Acked-by: Daniel Stone <daniel at fooishbar.org>
Signed-off-by: Gaetan Nadon <memsize at videotron.ca>
More information about the xorg-commit
mailing list