aboutsummaryrefslogtreecommitdiffstats
path: root/config/StdGNU.mk
Commit message (Collapse)AuthorAgeFilesLines
* tools: revert to using /var and /etc/Ian Campbell2013-01-251-7/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | 26470:acaf29203cf9 "tools+stubdom: install under /usr/local by default" moved more stuff under /usr/local than was desirable. In particular SYSCONFIG_DIR (configuration for initscripts) moved to /usr/local/etc/{sysconfig,defaults} while the initscripts themselves (correctly) remained in /etc/init.d. Moving /etc/xen/scripts breaks the udev bakcned rules file. Lastly stuff under /var was moved to /usr/local/var. Move these back to /etc/ and /var. Moving /etc wholesale rather thsn just the problematic bits is preferable for consistency. Although there seems to be some disagreement about /usr/local/var vs /var using /var is compatible with the FHS and what we think most people will expect. Most of this impacts Linux only but NetBSD appears to have been using /usr/local/var/lib which I have also reset to /var/lib. Note that we already paid no attention to autoconf --sysconfdir or --localstatedir ('etc' and 'var' respectively) so there is no change from that PoV. Signed-off-by: Ian Campbell <ian.campbell@citrix.com> Acked-by: Roger Pau Monné <roger.pau@citrix.com> Committed-by: Ian Campbell <ian.campbell@citrix.com>
* autoconf: check for wget and ftpRoger Pau Monne2012-10-301-2/+0
| | | | | | | | | | | | | Some OSes don't come with wget by default, so ftp should be choosen on those. Add an autoconf check to check for wget and ftp, and replace the usage of hardcoded wget in tools. [ Stubdom builds still use wget unconditionally. -iwj ] Signed-off-by: Christoph Egger <Christoph.Egger@amd.com> Signed-off-by: Roger Pau Monne <roger.pau@citrix.com> Acked-by: Ian Jackson <ian.jackson@eu.citrix.com> Committed-by: Ian Jackson <ian.jackson@eu.citrix.com>
* tools: honour --libdir when it is passed to ./configureMatt Wilson2012-07-051-8/+2
| | | | | | | | | | | | | | | | | | | | | | | | Currently shared libraries are automatically installed into /usr/lib or /usr/lib64, depending on the supplied --prefix value and $(XEN_TARGET_ARCH). Some systems, like recent Debian and Ubuntu releases, do not use /usr/lib64, but instead /usr/lib/x86_64-linux-gnu. With this change, packagers can supply the desired location for shared libraries on the ./configure command line. Packagers need to note that the default behaviour on 64-bit Linux systems will be to install shared libraries in /usr/lib, not /usr/lib64, unless a --libdir value is provided to ./configure. Additionally, the libfsimage plugins are now loaded explicitly from $LIBDIR/fs, removing platform-based decision trees in code. Signed-off-by: Matt Wilson <msw@amazon.com> Acked-by: Ian Jackson <Ian.Jackson@eu.citrix.com> Acked-by: Ian Campbell <ian.campbell@citrix.com> [ ijc -- resolve rejects in configure by rerunning autogen.sh. Dropped changes to remove m4/default_lib.m4 and update m4/pkg.m4 since they cause LIBDIR=/lib instead of /usr/lib. Reran ./autogen.sh after that too ] Committed-by: Ian Campbell <ian.campbell@citrix.com>
* tools: Correct PTHREAD options in config/StdGNU.mkIan Jackson2012-04-111-1/+0
| | | | | | | | | | | | | | | | | | | | | | It is not correct to say -lpthread. The correct option is -pthread, which may have sundry other effects on code generation etc. It needs to be passed both to compilation and linking. Fix the configure test to test -pthread, and plumb the resulting flag through to PTHREAD_{CFLAGS,LDFLAGS} in Tools.mk; also substitute PTHREAD_LIBS (although this will currently always be empty). Remove PTHREAD_LIBS setting from StdGNU.mk. Fix the one user (libxc) to use PTHREAD_{CFLAGS,LDFLAGS} too. There are still some other users in tree which pass -pthread or -lpthread by adding it as a literal to their own compiler options. These will be fixed in a later patch. Signed-off-by: Ian Jackson <ian.jackson@eu.citrix.com> Cc: Roger Pau Monne <roger.pau@entel.upc.edu> Acked-by: Roger Pau Monne <roger.pau@entel.upc.edu> Committed-by: Ian Jackson <Ian.Jackson@eu.citrix.com>
* autoconf: add check for curses libraryRoger Pau Monne2012-03-131-1/+0
| | | | | | | | | | | | Check for a curses compatible library (curses or ncurses basically). One of those is needed to compile Xen tools (gtraceview and xentop). Modify Makefiles/sources to use configure output (fetch CURSES_LIBS from tools/Tools.mk and header to include from tools/config.h) Signed-off-by: Roger Pau Monne <roger.pau@entel.upc.edu> Acked-by: Ian Jackson <ian.jackson@eu.citrix.com> Committed-by: Ian Jackson <ian.jackson@eu.citrix.com>
* xenpaging: add XEN_PAGING_DIR / libxl_xenpaging_dir_path()Olaf Hering2011-11-201-0/+2
| | | | | Signed-off-by: Olaf Hering <olaf@aepfle.de> Committed-by: Ian Jackson <ian.jackson.citrix.com>
* tools: Introduce XEN_RUN_DIR path.Anthony PERARD2011-06-271-0/+2
| | | | | | | | This patch also add libxl_run_dir_path() function in libxl. Signed-off-by: Anthony PERARD <anthony.perard@citrix.com> Acked-by: Ian Jackson <ian.jackson@eu.citrix.com> Committed-by: Ian Jackson <ian.jackson@eu.citrix.com>
* Tidy makefiles to use CFLAGS-$(foo) idiom instead of ifeq.Tim Deegan2011-03-081-6/+2
| | | | | Signed-off-by: Tim Deegan <Tim.Deegan@citrix.com> Acked-by: Keir Fraser <keir@xen.org>
* xen: add "lto=y" option to build Xen with link-time optimizations.Tim Deegan2011-03-071-2/+10
| | | | | | | | | | | | This involves gathering object files from .asm (which will be binary) and object files from .c (which will be in LTO format) separately until the final link. Only tested for x86_64 Xen builds using Clang/LLVM bitcode; it should be possible to do the same with newer GCCs and GIMPLE. Signed-off-by: Tim Deegan <Tim.Deegan@citrix.com> Acked-by: Keir Fraser <keir@xen.org>
* xen: add "clang=y" option to build Xen with clang/llvm instead of gcc.Tim Deegan2011-03-071-1/+9
| | | | | | | | | Tested with svn snapshot of clang and llvm from 17 February 2011. Only x86_64 hypervisor builds (make dist-xen clang=y) are supported and I haven't even begun to look at cross-compiling. Signed-off-by: Tim Deegan <Tim.Deegan@citrix.com> Acked-by: Keir Fraser <keir@xen.org>
* libxc: portability fixes for NetBSDChristoph Egger2011-01-061-0/+2
| | | | | | | | | | | | | | | | | Attached patch makes libxc build again on NetBSD after the recent rework. [ Modified by iwj: I changed the name of the new make variable from LIBDL to DLOPEN_LIBS. The latter conforms to the naming scheme for similar variables found in config/*.mk - PTHREAD_LIBS et al. Also I moved the setting of the variable to -dl from Linux to StdGNU (which makes it apply more widely) and also added it to SunOS.mk (based on pure guesswork). ] Signed-off-by: Christoph Egger <Christoph.Egger@amd.com> Signed-off-by: Ian Jackson <ian.jackson@eu.citrix.com>
* Config.mk et al: introduce XEN_LOCK_DIRStefano Stabellini2010-09-221-0/+2
| | | | | | | | | | Introduce a OS dependent global variable XEN_LOCK_DIR that points at the system directory that contains lock files. [fixed up for conflict in Config.mk -iwj] Signed-off-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com> Signed-off-by: Ian Jackson <ian.jackson@eu.citrix.com>
* tools, build system: Make changing distro-specific layout aspects easier2010-09-201-1/+1
| | | | | | | | | | | Introduce CONFIG_LEAF_DIR, SUBSYS_DIR, INITD_DIR variables to cope better with variation between distributions. See docs/misc/distro_mapping.txt for details. Signed-off-by: Bruce Edge <bruce.edge@gmail.com> Acked-by: Ian Jackson <ian.jackson@eu.citrix.com> Signed-off-by: Ian Jackson <ian.jackson@eu.citrix.com>
* Allow easier overriding of LIBLEAFDIR_x86_64 on GNU systemsKeir Fraser2010-09-131-1/+1
| | | | | | | | Some GNU systems (including Debian) do not use /usr/lib64. This change makes it easier to have the Xen build system on amd64 put its 64-bit libraries files in /usr/lib. Signed-off-by: Ian Jackson <ian.jackson@eu.citrix.com>
* split LDLIBS from LDFLAGS to fix link errors in recent toolchainsStefano Stabellini2010-08-111-1/+1
| | | | | | | | | | | | | | | | Linker command lines are order-sensitive. Move linker options -Lfoo -lfoo from LDFLAGS to LDLIBS and place this new variable after the objects to link. This resolves build errors in xenpagin and blktap with recent toolchains. rename SHLIB_CFLAGS to SHLIB_LDFLAGS rename LDFLAGS_* to LDLIBS_* move LDFLAGS usage after CFLAGS in CC calls remove stale comments in xenpaging Makefile Signed-off-by: Olaf Hering <olaf@aepfle.de> Signed-off-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com> Acked-by: Ian Jackson <ian.jackson@eu.citrix.com>
* tools and Makefiles: introduce and use new SYSCONFIG_DIR variableOlaf Hering2010-07-231-0/+3
| | | | | | | | | | | | On SuSE the configuration files in /etc/sysconfig/ will be updated in a smart way from templates found in /var/adm/fillup-templates/ Introduce new variable SYSCONFIG_DIR for Linux installations. Now only one place needs patching, or it can be specified as option to make(1). Signed-off-by: Olaf Hering <olaf@aepfle.de> Acked-by: Ian Jackson <ian.jackson@eu.citrix.com> Committed-by: Ian Jackson <ian.jackson@eu.citrix.com>
* tools: Make build again on netbsdKeir Fraser2009-11-101-0/+2
| | | | | Signed-off-by: Christoph Egger <Christoph.Egger@amd.com> Signed-off-by: Keir Fraser <keir.fraser@citrix.com>
* tools: don't require hardcoded firmware path in guest config fileKeir Fraser2009-06-231-0/+1
| | | | Signed-off-by: Christoph Egger <Christoph.Egger@amd.com>
* tools: get rid of hardcoded config dirsKeir Fraser2009-05-201-0/+8
| | | | | | | | | Remove *all* hardcoded "/etc/xen" strings in python code. Additionally, it removes pygrub_path from osdep.py. Its use has been replaced with auxbin.pathTo("pygrub"). Signed-off-by: Christoph Egger <Christoph.Egger@amd.com>
* build: Get rid of some more hardcoded install pathsKeir Fraser2009-03-311-1/+2
| | | | Signed-off-by: Christoph Egger <Christoph.Egger@amd.com>
* build system cleanup - get rid of some hardcoded pathsKeir Fraser2009-03-191-0/+3
| | | | Signed-off-by: Christoph Egger <Christoph.Egger@amd.com>
* Support building of out-of-tree merged qemu from gitKeir Fraser2008-07-031-0/+3
| | | | | | | | | | | This provides support for building the new merged qemu from qemu-xen.git, or from a local checkout. The default is still to use the in-tree version, because the patchman infrastructure for testing, and propagation from staging to xen-unstable, needs a small amount of work to cope with git. Signed-off-by: Ian Jackson <ian.jackson@eu.citrix.com>
* Add -fno-optimize-sibling-calls to debug CFLAGS. Also get rid of ?=Keir Fraser2008-03-171-3/+2
| | | | | assignment to CFLAGS. Signed-off-by: Keir Fraser <keir.fraser@citrix.com>
* Make stubdom/Makefile override XEN_OS to MiniOS, and addKeir Fraser2008-02-121-0/+1
| | | | | | | config/MiniOS.mk. Add PTHREAD_LIBS to configs (usually holding -lpthread). Signed-off-by: Samuel Thibault <samuel.thibault@eu.citrix.com>
* etherboot: Fix the build.Keir Fraser2008-01-311-0/+1
| | | | Signed-off-by: Ian Jackson <ian.jackson@eu.citrix.com>
* build: Make PREFIX work by fixing LIBDIRKeir Fraser2008-01-311-2/+4
| | | | | | | | | | | | | | | | | | | | In the current tree, setting PREFIX does not work very well. This is because of confusion about the meaning of LIBDIR. In some places it is the pathname tail of directories containing libraries (lib, lib64 or lib/amd64). But in other places it is a destination pathname (implicitly, including any PREFIX). This can result in PREFIX or /usr being added the wrong number of times. This patch splits LIBDIR into two variables, LIBLEAFDIR and LIBDIR. LIBDIR is the directory into which Xen libraries and other similar code is to be placed, and includes any PREFIX. LIBLEAFDIR is just the library tail and can be appended to various different prefixes; for example, to construct the X11 library directory for -L. Neither variable contains the value of DESTDIR, which is of course used only to redirect the results of `make install' when desired. Signed-off-by: Ian Jackson <ian.jackson@eu.citrix.com>
* Add PRIVATE_BINDIR. Use it.Keir Fraser2008-01-261-0/+3
| | | | Signed-off-by: Bastian Blank <waldi@debian.org>
* Add MANDIR, MAN1DIR and MAN8DIR. Use it.Keir Fraser2008-01-221-0/+3
| | | | Signed-off-by: Bastian Blank <waldi@debian.org>
* Add SBINDIR. Use it always.Keir Fraser2008-01-221-0/+1
| | | | Signed-off-by: Bastian Blank <waldi@debian.org>
* Add BINDIR. Use it.Keir Fraser2008-01-221-0/+1
| | | | Signed-off-by: Bastian Blank <waldi@debian.org>
* Add INCLUDEDIR. Use it.Keir Fraser2008-01-221-0/+1
| | | | Signed-off-by: Bastian Blank <waldi@debian.org>
* Apply PREFIX directly to LIBDIR.Keir Fraser2008-01-221-2/+2
| | | | Signed-off-by: Bastian Blank <waldi@debian.org>
* Add PREFIX definition as base for all installed files.Keir Fraser2008-01-221-0/+2
| | | | Signed-off-by: Bastian Blank <waldi@debian.org>
* xenconsoled: portability fixes:Keir Fraser2007-10-081-0/+1
| | | | | | | | | | | | | | | - Use openpty(), which does the same as the sequence of open(), grantpt(), unlockpt(), ptsname(), tcgetattr() simplifies code - Check return code from tcsetattr() - sprintf() -> snprintf() - OpenBSD lacks POSIX grantpt() and unlockpt() requires use of openpty() - Solaris lacks POSIX openpty() via feedback from SUN (John Levon) implement openpty() for Solaris, tested and ok'd by SUN (John Levon) Signed-off-by: Christoph Egger <Christoph.Egger@amd.com>
* Fix up locale strings for xmTom Wilkie2007-04-131-0/+1
| | | | Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
* Since CPP is being used with CFLAGS, it should be in lock-step with CC,Ewan Mellor2007-03-231-1/+1
| | | | | | to avoid having to specify both CC and CPP for the build. Signed-off-by: Jan Beulich <jbeulich@novell.com>
* tools: Clean up use of 'install' command.kfraser@localhost.localdomain2007-03-071-3/+3
| | | | | | | | | - convert raw "install" command to use $(INSTALL) - convert some $(INSTALL) to $(INSTALL_DATA) as appropriate - modify the specific $(INSTALL) definitions to use -p. Original patch by Ben Thomas <ben@virtualiron.com> Signed-off-by: Keir Fraser <keir@xensource.com>
* Explicitly use GNU msgfmt on non-GNU systems.kaf24@localhost.localdomain2006-12-291-0/+2
| | | | Signed-off-by: John Levon <john.levon@sun.com>
* [OpenBSD] Various changes to get Xen building on OpenBSD.kfraser@localhost.localdomain2006-10-181-0/+30
Signed-off-by: Keir Fraser <keir@xensource.com>