79cc455cb8
Revert "Make mklib propogate all errors"
...
This reverts commit d6f55492af
2010-02-18 14:48:53 -08:00
cc66847c10
mklib: remove unused -contents_of_archives(), add comments
2010-02-18 13:02:59 -07:00
d6f55492af
Make mklib propogate all errors
...
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Signed-off-by: Brian Paul <brianp@vmware.com>
2010-02-18 12:47:01 -07:00
205c9659cf
mklib: Teach mklib to fail build if link fails on cygwin
...
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Signed-off-by: Brian Paul <brianp@vmware.com>
(cherry picked from commit 551c96979e
2010-02-18 12:46:48 -07:00
77c0800381
mklib: Fix static library generation/installation on Solaris
...
Change ar flag from -v (-verbose) to -c (silence console output)
so that it stops causing make_ar_static_lib() to return a bunch
of output other than the resulting library file.
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
2010-01-19 19:06:06 -08:00
a1de400e8d
mklib: Extract archives into temporary directories
...
When static libraries are created from other archives, objects are
extracted and then deleted when the static library is done. This can
race when there are multiple static libraries being created from the
same archives as with libmesa.a and libmesagallium.a.
Should fix this issue with parallel jobs:
make[5]: *** No rule to make target
> `../../../../../../src/mesa/libmesagallium.a', needed by
> `radeon_dri.so'. Stop
Signed-off-by: Dan Nicholson <dbn.lists@gmail.com>
Reported-and-Tested-by: Sedat Dilek <sedat.dilek@gmail.com>
2010-01-08 06:01:22 -08:00
12039aa7a9
mklib: use a wrapper for ar
2009-12-30 09:30:24 -07:00
57cce7a409
mklib: put usage info into usage() function
2009-12-24 07:24:33 -07:00
191d9651cd
mklib: expand .a into .o files on FreeBSD, put common code into subroutines
2009-12-24 07:24:33 -07:00
ad7f9d71e2
darwin: mklib: Use lipo rather than file to figure out architectures of object files
2009-12-20 21:34:27 -08:00
0b4ea45e8a
util: Remove homegrown Windows KM profiler.
...
It's not sampling based so its results are biased towards functions called
many times.
2009-11-04 12:15:29 +00:00
23671e5358
mklib: Ensure target directory exists for library
...
Instead of relying on the Makefile to always generate $(TOP)/$(LIB_DIR),
just have mklib handle creating the directory. This should fix any races
when using parallel make.
Signed-off-by: Dan Nicholson <dbn.lists@gmail.com>
2009-08-04 06:25:26 -07:00
7eed6ab5b5
Cygwin build fixes
...
Fix mklib to deal with NOPREFIX and use --enable-auto-image-base for cygwin
Teach configure.ac some basic facts about cygwin
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
2009-06-08 14:30:46 -06:00
d2f4c2b632
minstall: Don't copy over an identical file
...
The rationale here is to avoid updating a timestamp for a file that
hasn't changed. Needless updates of the timestamp can ripple into
other projects, (xserver, etc.), useless recompiling due to a
'make install' in mesa that didn't actually change anything.
2009-05-21 07:52:13 -06:00
eef79d50bf
mklib: replace if/expr with case
...
Saves forking an expr for every object.
2009-04-30 16:55:54 -06:00
9cb3cdec76
mesa: Prepend "-Wl," to linking options
...
Let mklib ignore -Wl options inside the object list when building
static libraries
2009-04-30 16:52:56 -06:00
3cf6e62ae3
mklib improvements for Solaris
...
Move flags for linking standard C/C++ libraries from configure.ac to mklib
Use -norunpath flag when linking with Sun C++ compiler
Convert mklib -exports list into a linker mapfile
Set FINAL_LIBS correctly when -noprefix is used
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
2009-03-25 11:07:30 -07:00
4737a9fa25
autoconf: Update config.guess and config.sub from upstream
...
Grabbed the latest copies from the GNU config repo at
http://git.savannah.gnu.org/cgit/config.git .
2009-03-03 06:55:15 -08:00
3a3801c143
Merge commit 'origin/master' into gallium-0.2
...
Conflicts:
src/mesa/glapi/descrip.mms
src/mesa/shader/grammar/descrip.mms
2008-10-10 15:26:28 +01:00
145d49838f
mesa: fix static library construction
...
If the .a is made of other .a files, extract the objects from the later.
2008-10-06 11:01:31 -06:00
0397b2bb41
Merge branch 'gallium-0.1' into gallium-0.2
...
A first attempt at moving gallium onto a branch directly off master...
It will be interesting to see how much work this takes to get running.
Have resolved the conflicts semi-arbitarily, not compiled or tested.
Conflicts:
.gitignore
Makefile
configs/config.mgw
configs/darwin
configs/darwin-x86ppc
configs/default
configs/freebsd-dri
configs/linux-dri
configs/linux-dri-xcb
configs/linux-fbdev
configs/linux-static
configs/linux-x86-64-static
configs/linux-x86-static
doxygen/Makefile
include/GL/gl.h
progs/demos/Makefile
progs/demos/descrip.mms
progs/demos/texenv.c
progs/egl/.gitignore
progs/egl/Makefile
progs/glsl/.gitignore
progs/glsl/Makefile
progs/glsl/convolutions.c
progs/samples/Makefile.mgw
progs/tests/.gitignore
progs/trivial/.gitignore
progs/trivial/point-param.c
progs/trivial/tri.c
progs/xdemos/.gitignore
progs/xdemos/glthreads.c
src/egl/drivers/demo/Makefile
src/egl/drivers/dri/Makefile
src/egl/main/Makefile
src/glu/Makefile
src/glu/sgi/Makefile
src/glu/sgi/Makefile.mgw
src/glut/glx/Makefile.mgw
src/glut/os2/WarpWin.cpp
src/glut/os2/glut_cindex.cpp
src/glut/os2/glut_gamemode.cpp
src/glut/os2/glut_win.cpp
src/glut/os2/glut_winmisc.cpp
src/glut/os2/os2_glx.cpp
src/glut/os2/os2_menu.cpp
src/glut/os2/os2_winproc.cpp
src/glw/Makefile
src/glx/x11/dri_glx.c
src/glx/x11/glxext.c
src/mesa/Makefile
src/mesa/Makefile.mgw
src/mesa/descrip.mms
src/mesa/drivers/beos/Makefile
src/mesa/drivers/common/descrip.mms
src/mesa/drivers/common/driverfuncs.c
src/mesa/drivers/directfb/Makefile
src/mesa/drivers/dri/Makefile.template
src/mesa/drivers/dri/common/dri_bufmgr.c
src/mesa/drivers/dri/common/dri_bufmgr.h
src/mesa/drivers/dri/common/dri_util.c
src/mesa/drivers/dri/common/extension_helper.h
src/mesa/drivers/dri/common/mmio.h
src/mesa/drivers/dri/common/utils.c
src/mesa/drivers/dri/common/utils.h
src/mesa/drivers/dri/glcore/Makefile
src/mesa/drivers/dri/i810/i810screen.c
src/mesa/drivers/dri/i915/intel_ioctl.c
src/mesa/drivers/dri/i915/intel_ioctl.h
src/mesa/drivers/dri/i915/intel_screen.c
src/mesa/drivers/dri/i915/server/i830_common.h
src/mesa/drivers/dri/i915/server/i830_dri.h
src/mesa/drivers/dri/i965/intel_screen.c
src/mesa/drivers/dri/i965/server/i830_common.h
src/mesa/drivers/dri/i965/server/i830_dri.h
src/mesa/drivers/dri/mach64/mach64_screen.c
src/mesa/drivers/dri/nouveau/nouveau_context.h
src/mesa/drivers/dri/nouveau/nouveau_fifo.c
src/mesa/drivers/dri/nouveau/nouveau_fifo.h
src/mesa/drivers/dri/nouveau/nouveau_screen.c
src/mesa/drivers/dri/nouveau/nouveau_screen.h
src/mesa/drivers/dri/r128/r128_tex.h
src/mesa/drivers/dri/savage/savageioctl.h
src/mesa/drivers/fbdev/Makefile
src/mesa/drivers/osmesa/Makefile
src/mesa/drivers/osmesa/descrip.mms
src/mesa/drivers/x11/Makefile
src/mesa/drivers/x11/descrip.mms
src/mesa/drivers/x11/xm_dd.c
src/mesa/glapi/glapi.c
src/mesa/glapi/glthread.c
src/mesa/main/api_validate.c
src/mesa/main/attrib.c
src/mesa/main/bufferobj.c
src/mesa/main/bufferobj.h
src/mesa/main/buffers.c
src/mesa/main/config.h
src/mesa/main/context.c
src/mesa/main/descrip.mms
src/mesa/main/drawpix.c
src/mesa/main/enums.c
src/mesa/main/fbobject.c
src/mesa/main/glheader.h
src/mesa/main/imports.c
src/mesa/main/mipmap.c
src/mesa/main/mm.c
src/mesa/main/mm.h
src/mesa/main/mtypes.h
src/mesa/main/points.c
src/mesa/main/sources
src/mesa/main/state.c
src/mesa/main/texcompress_fxt1.c
src/mesa/main/texenvprogram.c
src/mesa/main/texobj.c
src/mesa/main/texstate.c
src/mesa/main/texstore.c
src/mesa/math/descrip.mms
src/mesa/shader/arbprogram.c
src/mesa/shader/descrip.mms
src/mesa/shader/prog_execute.c
src/mesa/shader/prog_statevars.c
src/mesa/shader/prog_statevars.h
src/mesa/shader/prog_uniform.c
src/mesa/shader/program.c
src/mesa/shader/program.h
src/mesa/shader/shader_api.c
src/mesa/shader/slang/descrip.mms
src/mesa/shader/slang/library/slang_vertex_builtin_gc.h
src/mesa/sources
src/mesa/swrast/descrip.mms
src/mesa/swrast/s_drawpix.c
src/mesa/swrast/s_fragprog.c
src/mesa/swrast/s_readpix.c
src/mesa/swrast/s_span.c
src/mesa/swrast_setup/descrip.mms
src/mesa/tnl/descrip.mms
src/mesa/tnl/t_context.h
src/mesa/tnl/t_vp_build.c
src/mesa/tnl/tnl.h
src/mesa/vbo/descrip.mms
src/mesa/vbo/vbo_context.c
src/mesa/vbo/vbo_exec_array.c
src/mesa/x86-64/xform4.S
src/mesa/x86/rtasm/x86sse.c
src/mesa/x86/rtasm/x86sse.h
windows/VC6/progs/glut/glut.dsp
windows/VC7/mesa/gdi/gdi.vcproj
windows/VC7/mesa/glu/glu.vcproj
windows/VC7/mesa/mesa.sln
windows/VC7/mesa/mesa/mesa.vcproj
windows/VC7/mesa/osmesa/osmesa.vcproj
windows/VC7/progs/glut/glut.vcproj
windows/VC8/mesa/gdi/gdi.vcproj
windows/VC8/mesa/glu/glu.vcproj
windows/VC8/mesa/mesa.sln
windows/VC8/mesa/mesa/mesa.vcproj
windows/VC8/progs/glut/glut.vcproj
2008-09-11 16:05:15 +01:00
ac0d19601c
Apple: Cleaned up some linking and dylib ids issues
2008-08-11 09:17:06 -07:00
c76d86f0ab
raw2png: Fix channel order in a8b8g8r8/x8b8g8r8 formats.
2008-08-07 18:58:30 +01:00
eb422a7243
raw2png: support some depth formats.
2008-08-07 18:58:29 +01:00
883097053d
win32kprof: Store the profile data as an caller->callee hash table, instead of a trace.
2008-07-22 09:45:33 +09:00
2fafe29793
win32kprof: Generate callgraphs.
...
Relies on gprof2dot.py.
2008-07-22 09:45:33 +09:00
ac25408c47
win32kprof: Convert tabs to spaces.
2008-07-22 09:45:33 +09:00
1662be3764
win32kprof: Consider the section alignment when estimating the image base.
2008-07-22 09:45:32 +09:00
939be248fe
raw2png: Handle r5g6b5 format.
2008-07-20 09:27:27 +09:00
270b2a5c54
mklib: don't version symbols when using --exports
...
Use the default version instead of one based on the library SONAME
in the version script created by --exports.
2008-07-14 08:41:54 -06:00
f7eb0cec69
mklib: don't version symbols when using --exports
...
Use the default version instead of one based on the library SONAME
in the version script created by --exports.
2008-07-14 08:37:38 -06:00
6701ecb3ba
raw2png: More helpful messages. Handle PIPE_FORMAT_A8B8G8R8_SNORM.
2008-07-08 07:29:18 +09:00
30b6b0b9ef
raw2png: Update formats from p_formats.h
2008-07-08 07:29:18 +09:00
79ca9734ea
Support conversion of YUV surfaces.
2008-07-03 20:50:23 +09:00
e1f9adc274
Solaris port of Mesa 7.1 with autoconf support
...
Signed-off-by: Brian Paul <brian.paul@tungstengraphics.com>
2008-06-21 10:19:45 -06:00
1043a7c71a
Make minstall work with Solaris /bin/sh
...
Solaris /bin/sh doesn't set $PWD for you
Signed-off-by: Brian Paul <brian.paul@tungstengraphics.com>
2008-06-21 10:19:45 -06:00
4a49f1d2e2
Parse the section:offset instead of the rva+base when reading mapfiles.
2008-06-19 10:47:49 +09:00
6f7ed99b30
revert the DRI2 commits
2008-06-12 00:11:54 +01:00
4566b006f1
Bring in DRI2 changes
2008-06-11 14:10:08 +01:00
da7b3d294b
pull in minor mklib change to fix debugging
2008-06-05 10:05:37 +01:00
d0e2a9add2
Add copyright header.
2008-05-26 20:02:43 +09:00
eab4472ee6
Demangle C++ symbols.
2008-05-25 01:35:53 +09:00
63ddae0990
gallium: Pre-processor for win32 kernel profile output.
2008-05-24 19:26:14 +09:00
a6ad492774
gallium: Simple facility to dump and view images for debugging.
2008-05-07 04:51:55 +09:00
00994ac08c
autoconf: Scrape the version from configs/default
...
Added the make script version.mk to print the various version numbers
from configs/default. This is used to substitute the version in autoconf
rather than duplicating it in both places.
2008-05-05 14:21:28 -07:00
f9c8af31c5
Add support for dfbsd to mklib script.
2008-04-09 11:03:05 -07:00
9993ccce69
Apple: Pulled in changes from Apple's patchset to allow mesa to build on darwin again
...
(cherry picked from commit e70609b7b8
2008-02-19 00:55:11 -08:00
5c0c883104
added -altopts to allow overriding all other opts
2008-02-07 13:21:14 -07:00
78175579c2
autoconf: Replace install-sh with symlink to minstall
...
Since install-sh is only used to satisfy an autoconf requirement, we
don't need the actual script. Instead, it's now just a symlink to
minstall, which provides a similar install wrapper script.
2007-12-11 08:24:27 -08:00
d5cee90cf5
autoconf: Add support files required for autoconf use
...
The standard autoconf initialization macros require that config.guess,
config.sub and install-sh exist. The config.* scripts are from gnulib
HEAD, and the install-sh script is from automake HEAD.
2007-12-07 14:34:27 -08:00
fc7ddea853
Use -Bsymbolic for linking all shared objects.
...
Fixes https://bugs.freedesktop.org/show_bug.cgi?id=10132 .
Also remove comment about SONAME, as SONAME only applies to shared libraries.
2007-12-04 18:31:29 +01:00
d7eb97bbc3
confdiff.sh: A testing script for comparing configs settings
...
This is a simple script that compares the make variables set by two
different configs stubs. The purpose is to highlight differences so
that any unnecessary duplication or divergence can be removed.
For example, on Linux x86:
$ ./bin/confdiff.sh linux linux-x86
The output isn't very clean, but it should highlight that the only
difference is that the x86 target uses x86 assembler sources.
The script uses bash, mktemp, make, sed and diff. It is probably not
very portable and might only work on GNU make.
2007-10-31 14:59:13 -07:00
2a3e33865d
add support for LDFLAGS env var
2007-09-28 18:42:21 -06:00
1a413b4d77
Use -pthread instead of -lpthread on FreeBSD.
2007-06-22 11:19:42 -07:00
ed2fddc98e
special case for -pthread (bug 10876)
2007-05-08 14:03:04 -06:00
98abd1bbc8
simplify .a suffixing
2007-03-27 07:58:47 -06:00
a9455bb9a7
remove static lib before building to make more bulletproof
2007-03-27 07:56:34 -06:00
26626c0052
minstall: Pass correct destination file path to $RM regardless of source path.
2006-12-11 17:45:06 +01:00
d71a5647a3
minstall: Always remove destination file before (re-)creating it.
...
This avoids issues with overwriting files that are being used.
2006-12-11 17:36:35 +01:00
0a3a1c6ae9
fix -noprefix option for Solaris (bug 7722)
2006-11-10 12:47:56 +00:00
464fcd0dd8
New bin/minstall script - a minimal replacement for 'install'.
...
Correctly handles symlinks so we can get rid of the COPY_LIBS stuff.
2006-10-19 20:09:05 +00:00
3775b566fa
mkdir -> mkdir -p, since /usr/include might not exist in the installroot yet
2006-08-10 20:24:50 +00:00
65897c04c8
don't create include/GLES yet
2006-06-16 13:41:05 +00:00
5beff7c6c1
updates for GNU/Hurd (bug 6657)
2006-04-19 14:03:04 +00:00
b3282a3b9d
assorted AIX, IRIX fixes from Dan Schikore
2006-04-18 12:56:11 +00:00
1e1af99132
Use 'file' command in more places to determine the library ABI (IRIX, SunOS,
...
Darwin), removes need to pass in special -archopt flags.
Restore the -dlopen flag afterall.
2006-04-14 14:14:51 +00:00
56e0ee8efe
remove the -dlopen option. Always make both kinds of libs for AIX, Darwin.
2006-04-13 15:17:50 +00:00
fe14cf6951
Fixes for AIX, SunOS, Darwin. -dlopen flag to build dlopen()'able modules
...
for AIX, Darwin. (Dan Schikore)
2006-04-13 02:23:25 +00:00
59ebe1ff77
pass -m32 or -m64 to linker for SunOS as needed (bug 6484)
2006-04-05 13:43:02 +00:00
ef8b89faee
some comments for Darwin
2006-03-30 14:28:28 +00:00
a5033a0421
fix AIX issues (bug 5874)
2006-02-14 14:57:04 +00:00
30cc822163
install GLw headers (bug 5396)
2006-01-04 20:10:16 +00:00
413a49ce59
special-case Darwin (bug 4509)
2006-01-04 20:06:13 +00:00
1c04be573e
Fix FreeBSD build by building libGL in the order desired, and doing a fix to my
...
mklib changes.
2005-10-22 01:41:40 +00:00
32a7ab2197
Darwin version fix (SF bug 1334274)
2005-10-21 15:39:42 +00:00
b83435f53b
Attempt to fix libGL on FreeBSD, where the library was being built without any
...
dependencies, breaking builds of third-party software.
2005-10-18 23:36:40 +00:00
7a534dcab1
remove .a file before creating new one
2005-09-14 02:18:09 +00:00
7bb7f97594
fix FreeBSD problem (bug 4435)
2005-09-13 13:36:47 +00:00
aba4864a25
Make the linux-dri-x86 builds work on x86-64 again. mklib now
...
determines the bits (either 32 or 64) for libraries without the lib
prefix. progs/egl/Makefile passes CFLAGS on the link commands so that
things like '-m32' get propagated.
2005-08-08 23:22:46 +00:00
f1a261377f
Since this isn't a bash script, don't use function and instead inline the usage
...
into the one place that it's used.
2005-08-08 03:26:18 +00:00
7c1ab40898
Add license/copyright.
...
Add -h/--help option for usage.
Minor clean-ups.
2005-07-25 23:49:50 +00:00
8dcc6736ab
Added -linker option to mklib, used to specify a particular program for
...
linking, if relevant.
Updated Makefiles to use -linker option instead of setting CC, CXX env vars.
2005-07-25 22:59:58 +00:00
ccda2162f6
fix Darwin dynamic lib naming
2005-06-30 02:33:25 +00:00
40b8b57ed4
Make install install GLES too
2005-06-05 02:10:58 +00:00
3e1961839e
if building 32-bit objects in 64-bit environment, use -m32 flag
2005-03-03 01:38:13 +00:00
a2990a9d73
Add DESTDIR install target
2005-02-21 00:20:19 +00:00
0d5e6ccfd6
fixed OSF/1 shared lib problem (bug 1065260)
2004-11-29 17:23:12 +00:00
b17a1a1826
merge the AIX and AIX64 cases
2004-11-01 22:28:42 +00:00
158a251a6b
added initial support for -exports option, Linux/OpenBSD only for now
2004-10-16 15:10:45 +00:00
c498742768
if CXX or CC env vars aren't set, use g++, gcc by default (Linux)
2004-10-16 15:02:16 +00:00
a16bdb5fb7
Enable builds on AIX 64-bit
2004-10-01 13:33:26 +00:00
b784b8f21f
indentation fixes
2004-08-14 14:30:36 +00:00
ef4dd5ad79
Update BeOS mklib to set mimetype and version.
...
Static lib build support added.
2004-08-14 10:12:38 +00:00
76cfed853f
added commands for AIX shared libs (Shane Blackett)
2004-07-01 15:33:14 +00:00
9eecb03226
Make sure mklib sees the definition of CC and CXX. Make mklib respect
...
the definitions of CC and CXX on Linux. This fixed build issues with
sunos5-gcc and build issues on GCC 2.x Linux when CC and CXX are set
to a GCC 3.x compiler.
2004-06-25 22:51:39 +00:00
ac0cfee885
fix HP-UX typo (bug 941576)
2004-04-25 15:13:56 +00:00
580548d046
added CYGWIN support
2004-04-22 16:16:42 +00:00
c50d77a7f1
minor tweak for Darwin
2004-04-13 17:35:17 +00:00
dd74e36763
added -noprefix option for making DRI drivers
2004-04-08 22:26:22 +00:00
52fb07e2b2
merge from 6.0.1 branch
2004-03-30 14:47:02 +00:00
Dan Nicholson
Brian Paul
Jon TURNEY
Alan Coopersmith
Jeremy Huddleston
José Fonseca
Carl Worth
Tormod Volden
Keith Whitwell
Brian Paul
Jeremy Huddleston
José Fonseca
Julien Cristau
Alan Hourihane
Hasso Tepper
Jeremy Huddleston
Andy Skinner
Michel Dänzer
Eric Anholt
Brian
Bernardo Innocenti
Adam Jackson
Eric Anholt
Ian Romanick
Jon Smirl
Dave Airlie
Karl Schultz
Philippe Houdoin