diff options
| author |   Patrick J Volkerding <volkerdi@slackware.com> | 2010-05-19 08:58:23 +0000 |
|---|---|---|
| committer |   Eric Hameleers <alien@slackware.com> | 2018-05-31 22:43:05 +0200 |
| commit | b76270bf9e6dd375e495fec92140a79a79415d27 (patch) | |
| tree | 3dbed78b2279bf9f14207a16dc634b90995cbd40 /source/d | |
| parent | 5a12e7c134274dba706667107d10d231517d3e05 (diff) | |
| download | current-b76270bf9e6dd375e495fec92140a79a79415d27.tar.gz current-b76270bf9e6dd375e495fec92140a79a79415d27.tar.xz | |
Slackware 13.1slackware-13.1
Wed May 19 08:58:23 UTC 2010
Slackware 13.1 x86_64 stable is released!
Lots of thanks are due -- see the RELEASE_NOTES and the rest of the
ChangeLog for credits. The ISOs are on their way to replication,
a 6 CD-ROM 32-bit set and a dual-sided 32-bit/64-bit x86/x86_64 DVD.
We are taking pre-orders now at store.slackware.com, and offering
a discount if you sign up for a subscription. Consider picking up
a copy to help support the project. Thanks again to the Slackware
community for testing, contributing, and generally holding us to a
high level of quality. :-)
Enjoy!
Diffstat (limited to 'source/d')
33 files changed, 4366 insertions, 1281 deletions
diff --git a/source/d/autoconf/autoconf.SlackBuild b/source/d/autoconf/autoconf.SlackBuild index 41dbfe9ea..7ed33f754 100755 --- a/source/d/autoconf/autoconf.SlackBuild +++ b/source/d/autoconf/autoconf.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2005-2009 Patrick J. Volkerding, Sebeka, Minnesota, USA +# Copyright 2005-2010 Patrick J. Volkerding, Sebeka, Minnesota, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -21,11 +21,23 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -VERSION=2.63 -ARCH=noarch -NUMJOBS=${NUMJOBS:-" -j7 "} +VERSION=2.65 BUILD=${BUILD:-1} +NUMJOBS=${NUMJOBS:-" -j7 "} + +# Note: the package is _built_ as 'noarch' + +# Automatically determine the architecture we're building on: +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) export ARCH=i486 ;; + arm*) export ARCH=arm ;; + # Unless $ARCH is already set, use uname -m for all other archs: + *) export ARCH=$( uname -m ) ;; + esac +fi + CWD=$(pwd) TMP=${TMP:-/tmp} PKG=$TMP/package-autoconf @@ -35,7 +47,7 @@ mkdir -p $TMP $PKG cd $TMP rm -rf autoconf-$VERSION -tar xvf $CWD/autoconf-$VERSION.tar.?z* || exit 1 +tar xvf $CWD/autoconf-$VERSION.tar.xz || exit 1 cd autoconf-$VERSION chown -R root:root . find . \ @@ -47,7 +59,8 @@ find . \ ./configure \ --prefix=/usr \ --infodir=/usr/info \ - --mandir=/usr/man + --mandir=/usr/man \ + --build=$ARCH-slackware-linux make $NUMJOBS || make || exit 1 make install DESTDIR=$PKG || exit 1 @@ -66,5 +79,5 @@ zcat $CWD/doinst.sh.gz > $PKG/install/doinst.sh cat $CWD/slack-desc > $PKG/install/slack-desc cd $PKG -/sbin/makepkg -l y -c n $TMP/autoconf-$VERSION-$ARCH-$BUILD.txz +/sbin/makepkg -l y -c n $TMP/autoconf-$VERSION-noarch-$BUILD.txz diff --git a/source/d/automake/automake.SlackBuild b/source/d/automake/automake.SlackBuild index c105dfeba..b7ef13c6b 100755 --- a/source/d/automake/automake.SlackBuild +++ b/source/d/automake/automake.SlackBuild @@ -21,11 +21,20 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -VERSION=1.10.1 -ARCH=${ARCH:-x86_64} # note: the package is _built_ as 'noarch' +VERSION=1.11.1 NUMJOBS=${NUMJOBS:-" -j7 "} BUILD=${BUILD:-1} +# Note: the package is _built_ as 'noarch' +# Automatically determine architecture for build & packaging: +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) export ARCH=i486 ;; + # Unless $ARCH is already set, use uname -m for all other archs: + *) export ARCH=$( uname -m ) ;; + esac +fi + CWD=$(pwd) TMP=${TMP:-/tmp} PKG=$TMP/package-automake @@ -46,6 +55,7 @@ find . \ ./configure \ --prefix=/usr \ + --mandir=/usr/man \ --infodir=/usr/info \ --build=$ARCH-slackware-linux diff --git a/source/d/git/git-1.6.4.tar.sign b/source/d/binutils/binutils-2.20.51.0.8.tar.sign index 2230cf7d7..321434264 100644 --- a/source/d/git/git-1.6.4.tar.sign +++ b/source/d/binutils/binutils-2.20.51.0.8.tar.sign @@ -2,7 +2,7 @@ Version: GnuPG v1.4.9 (GNU/Linux) Comment: See http://www.kernel.org/signature.html for info -iD8DBQBKcAouyGugalF9Dw4RAqFKAJ9oLB8/l1VkfFlEjcAFo4Y5SUcq8gCeIbNI -tWNG/MK+CTVBaz3cdiWCeJ8= -=E/iU +iD8DBQBLxPBQyGugalF9Dw4RAq+mAKCJbsksL4Hlb/tH9dL7kTbFE/BO8QCfXStv +0oOljJ/jyU8Z8SlaEywyfys= +=qMqR -----END PGP SIGNATURE----- diff --git a/source/d/binutils/binutils.SlackBuild b/source/d/binutils/binutils.SlackBuild index c83c29215..b0ffefb6e 100755 --- a/source/d/binutils/binutils.SlackBuild +++ b/source/d/binutils/binutils.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2005-2009 Patrick J. Volkerding, Sebeka, Minnesota, USA +# Copyright 2005-2010 Patrick J. Volkerding, Sebeka, Minnesota, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -21,14 +21,21 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -VERSION=2.18.50.0.9 -ARCH=${ARCH:-x86_64} -NUMJOBS=${NUMJOBS:-" -j7 "} -BUILD=${BUILD:-2} +PKGNAM=binutils +VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} +BUILD=${BUILD:-1} -CWD=$(pwd) -TMP=${TMP:-/tmp} -PKG=$TMP/package-binutils +# Automatically determine the architecture we're building on: +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) export ARCH=i486 ;; + arm*) export ARCH=arm ;; + # Unless $ARCH is already set, use uname -m for all other archs: + *) export ARCH=$( uname -m ) ;; + esac +fi + +NUMJOBS=${NUMJOBS:-" -j7 "} if [ "$ARCH" = "i486" ]; then SLKCFLAGS="-O2 -march=i486 -mtune=i686" @@ -41,13 +48,18 @@ elif [ "$ARCH" = "x86_64" ]; then LIBDIRSUFFIX="64" fi +CWD=$(pwd) +TMP=${TMP:-/tmp} +PKG=$TMP/package-binutils + rm -rf $PKG mkdir -p $TMP $PKG cd $TMP rm -rf binutils-$VERSION -tar xvf $CWD/binutils-$VERSION.tar.bz2 || exit 1 +tar xvf $CWD/binutils-$VERSION.tar.?z* || exit 1 cd binutils-$VERSION + chown -R root:root . find . \ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ @@ -60,6 +72,8 @@ CFLAGS="$SLKCFLAGS" \ ./configure \ --prefix=/usr \ --libdir=/usr/lib${LIBDIRSUFFIX} \ + --mandir=/usr/man \ + --infodir=/usr/info \ --with-docdir=/usr/doc/binutils-$VERSION \ --enable-shared \ --enable-multilib \ @@ -110,6 +124,15 @@ cp \ $CWD/release.binutils-* \ COPYING* ChangeLog.linux MAI* README* \ $PKG/usr/doc/binutils-$VERSION + +# If there's a ChangeLog, installing at least part of the recent history +# is useful, but don't let it get totally out of control: +if [ -r ChangeLog ]; then + DOCSDIR=$(echo $PKG/usr/doc/*-$VERSION) + cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog + touch -r ChangeLog $DOCSDIR/ChangeLog +fi + chown -R root:root $PKG/usr/doc/binutils-$VERSION # Add slack-desc: diff --git a/source/d/binutils/release.binutils-2.18.50.0.9 b/source/d/binutils/release.binutils-2.18.50.0.9 deleted file mode 100644 index ecae5c083..000000000 --- a/source/d/binutils/release.binutils-2.18.50.0.9 +++ /dev/null @@ -1,1028 +0,0 @@ -This is the beta release of binutils 2.18.50.0.9 for Linux, which is -based on binutils 2008 0822 in CVS on sourceware.org plus various -changes. It is purely for Linux. - -All relevant patches in patches have been applied to the source tree. -You can take a look at patches/README to see what have been applied and -in what order they have been applied. - -Starting from the 2.18.50.0.4 release, the x86 assembler no longer -accepts - - fnstsw %eax - -fnstsw stores 16bit into %ax and the upper 16bit of %eax is unchanged. -Please use - - fnstsw %ax - -Starting from the 2.17.50.0.4 release, the default output section LMA -(load memory address) has changed for allocatable sections from being -equal to VMA (virtual memory address), to keeping the difference between -LMA and VMA the same as the previous output section in the same region. - -For - -.data.init_task : { *(.data.init_task) } - -LMA of .data.init_task section is equal to its VMA with the old linker. -With the new linker, it depends on the previous output section. You -can use - -.data.init_task : AT (ADDR(.data.init_task)) { *(.data.init_task) } - -to ensure that LMA of .data.init_task section is always equal to its -VMA. The linker script in the older 2.6 x86-64 kernel depends on the -old behavior. You can add AT (ADDR(section)) to force LMA of -.data.init_task section equal to its VMA. It will work with both old -and new linkers. The x86-64 kernel linker script in kernel 2.6.13 and -above is OK. - -The new x86_64 assembler no longer accepts - - monitor %eax,%ecx,%edx - -You should use - - monitor %rax,%ecx,%edx - -or - monitor - -which works with both old and new x86_64 assemblers. They should -generate the same opcode. - -The new i386/x86_64 assemblers no longer accept instructions for moving -between a segment register and a 32bit memory location, i.e., - - movl (%eax),%ds - movl %ds,(%eax) - -To generate instructions for moving between a segment register and a -16bit memory location without the 16bit operand size prefix, 0x66, - - mov (%eax),%ds - mov %ds,(%eax) - -should be used. It will work with both new and old assemblers. The -assembler starting from 2.16.90.0.1 will also support - - movw (%eax),%ds - movw %ds,(%eax) - -without the 0x66 prefix. Patches for 2.4 and 2.6 Linux kernels are -available at - -http://www.kernel.org/pub/linux/devel/binutils/linux-2.4-seg-4.patch -http://www.kernel.org/pub/linux/devel/binutils/linux-2.6-seg-5.patch - -The ia64 assembler is now defaulted to tune for Itanium 2 processors. -To build a kernel for Itanium 1 processors, you will need to add - -ifeq ($(CONFIG_ITANIUM),y) - CFLAGS += -Wa,-mtune=itanium1 - AFLAGS += -Wa,-mtune=itanium1 -endif - -to arch/ia64/Makefile in your kernel source tree. - -Please report any bugs related to binutils 2.18.50.0.9 to -hjl.tools@gmail.com - -and - -http://www.sourceware.org/bugzilla/ - -Changes from binutils 2.18.50.0.8: - -1. Update from binutils 2008 0822. -2. Add Intel AES+AVX support. -3. Add syscall and sysret for Cpu64 in x86 assembler. -4. Fix i386/x86-64 TLS 2 support. -5. Disable gas generated debug info when compiler generates it. PR -gas/6656. -6. Fix an assembler .set bug. PR 6848. -7. Remove 2MB section gap from linker output. PR ld/6833. -8. Fix stab warnings caused linker errors. PR 6478. -9. Remove AVX registers from DWARF register map. -10. Fix linking Linux .o against FreeBSD .so. PR 4424. -11. Fix objcopy --extract-symbol. PR 6774. -12. Improve gold. -13. Improve mips GOT and non-PIC support. -14. Fix various arms bugs. -15. Fix various bfin bugs. -16. Fix various frv bugs. -17. Fix various h8300 bugs. -18. Fix various ppc bugs. -19. Fix various spu bugs. -20. Fix various xtensa bugs. - -Changes from binutils 2.18.50.0.7: - -1. Update from binutils 2008 0709. -2. Allow vmovd with 64bit operand in x86 assembler. -3. Improve -msse-check in x86 assembler. -4. Fix an AVX assembler bug in Intel syntax. PR 6517. -5. Improve error message in Intel syntax for x86 assembler. PR 6518. -6. Add the ".sse_check" directive to x86 assembler. -7. Improve gold. -8. Improve objcopy/strip. PR 2995/6473. -9. Improve objdump -g. PR 6483. -10. Improve ld --sort-common. PR 6430. -11. Add multi-GOT support for m68k. -12. Fix various arm bugs. -13. Fix various avr bugs. -14. Fix various hppa bugs. -15. Fix various m68k bugs. -16. Fix various mips bugs. -17. Fix various mmix bugs. -18. Fix various ppc bugs. -19. Fix various spu bugs. -20. Fix various xtensa bugs. - -Changes from binutils 2.18.50.0.6: - -1. Update from binutils 2008 0502. -2. Add Intel EPT and MOVBE support. -3. Correct Intel FMA operand order. -4. Change Intel CLMUL to Intel PCLMUL. -5. Add -msse-check to x86 assembler to warn SSE instruction where -there is AVX equivalent. -6. Provide backward compatibility for ELF object files with more -than 64K sections generated by the older binutils. PR 6412. -7. Improve FDPIC support. -8. Add -wL switch to readelf to dump decoded contents of .debug_line. -9. Add -ag switch to assembler show general information in listings. -10. Improve objcopy symbol filtering performance. PR 6034. -12. Correct think archive support. -13. Improve ELF/Sparc support. -14. Fix various mips bugs. -15. Fix various sh bugs. -16. Fix various spu bugs. - -Changes from binutils 2.18.50.0.5: - -1. Update from binutils 2008 0403. -2. Add Intel AES, CLMUL, AVX/FMA support. -3. Improve error handling in x86 linker for undefined hidden/internal -symbols when building a shared object. PR ld/5789/5943. -4. Add a new ELF linker, gold. -5. Add think archive support. -6. Fix various arm bugs. -7. Fix various avr bugs. -8. Fix various bfin bugs. -9. Fix various hppa bugs. -10. Fix various m68k bugs. -11. Fix various mips bugs. -12. Fix various s390 bugs. -13. Fix various spu bugs. - -Changes from binutils 2.18.50.0.4: - -1. Update from binutils 2008 0314. -2. Add Intel XSAVE new instruction support. -3. Fix an ia64 linker crash on unsupported TLS relocations. PR 5913. -4. Fix x86 assembler for gcc 4.3. -5. Fix a linker memory corruption. PR 5788. -6. Correct linker 64k section support. PR 5900. -7. Correct hidden, weak and undefined symbol handling. PR 5789. -8. Fix linker for 64bit targets on 32bit hosts. PR 5303/5755. -9. Fix assembler crash with .set on register. PR 5543. -10. Fix a typo in linker. PR 5765. -11. Fix "string -O" infinite loop. PR 5713. -12. Fix .exitm in assembler. PR 5895. -13. Fix a linker crash. PR 5761. -14. Fix various arm bugs. -15. Fix various bfin bugs. -16. Fix various h8 bugs. -17. Fix various ppc bugs. -18. Fix various spu bugs. -19. Fix various xtensa bugs. - -Changes from binutils 2.18.50.0.3: - -1. Update from binutils 2008 0208. -2. Update readelf/objdump to dump DWARF frame info with machine -register names on x86. -3. Optimize x86-64 assembler to omit REX.W prefix when it is ignored. -4. Add operand size check to x86 assembler. PR 5534. -5. Add -march=CPU[,+EXTENSION...], -mmnemonic, -msyntax, -mindex-reg, --mnaked-reg and -mold-gcc options to x86 assembler. -6. Add -Mintel-mnemonic/-Mintel-mnemonic options to x86 disassembler. -7. Update x86 disassembler to handle r12 like rsp in memory operand. -8. Update x86 disassembler to properly support movntq, movntsd, -movntss, movntps, movntpd, movntdq and movntdqa. -9. Update x86 disassembler to support AMD nops. -10. Update x86 disassembler for cvtsi2ss/cvtsi2sd. -11. Fix x86 assembler to support new instructions on 2 different archs. -12. Update linker not to generate incorrect debug info for 64bit target -on 32bit host. PR 5303. -13. Update ia64 assembler to support new registers in Itanium 9100 -series. -14. Fix strip on PT_NOTE segment. PR 5488. -15. Fix strip/objcopy on HPUX/ia64. PR 5449. -16. Fix strip/objcopy for EFI. PR 5307. -17. Remove duplicated sections from objdump for COFF/PE. PR 5299. -18. Fix a linker corruption. PR 5522. -19. Fix mingw for 64bit targets. -20. Fix various arm bugs. -21. Fix various fr30 bugs. -22. Fix various frv bugs. -23. Fix various hppa bugs. -24. Fix various m10300 bugs. -25. Fix various m32r bugs. -26. Fix various m68k bugs. -27. Fix various mips bugs. -28. Fix various ppc bugs. -29. Fix various spu bugs. -30. Fix various xtensa bugs. - -Changes from binutils 2.18.50.0.2: - -1. Update from binutils 2007 1102. -2. Support link in Linux object files on FreeBSD. PR 4424. -3. Add Intel SMX instruction support to x86 assembler/diasassembler. -4. Fix an objcopy regression where we failed to adjust section -flags. PR 5233. -5. Improve irregular instruction support in x86 assembler. -6. Improve support for instructions with restricted operands in x86 -diasassembler. -7. Fix an x86-64 assembler bug where extra REX byte generated in Intel -mode. PR 5109. -8. Update .pushsection directive support in assembler. PRs 5221. -9. Improve linker -z relro support. -10. Add support for generating wide character strings in assembler. -11. Improve relocation process for DWARF debug info in readelf. -12. Add a linker warning for invalid merge section with unterminated -strings. -13. Improve linker support of DWARF debug info for discarded sections -during linker-relaxation. -14. Improve fabs detection. PR 5147. -15. Improve non-bash support. PR 5215. -16. Improve support for non-gcc compiler. PRs 5146/5160. -17. Improve error messages. PRs 5172/5173/5161/5158/5155/ -5121-5126/5129/5131-5137/5143/5142/5078/5089/5090. -18. Fix various cr16 bugs. -19. Fix various m10300 bugs. -20. Fix various mips bugs. -21. Fix various ppc bugs. -22. Fix various xtensa bugs. - -Changes from binutils 2.18.50.0.1: - -1. Update from binutils 2007 1001. -2. Speed up hash table lookup in linker. -3. Add -c/--archive-index option to readelf. -4. Fix an readelf crash. PR 5011. -5. Fix an x86 assembler Intel mode bug. PR 5080. -6. Add EIP support in x86 assembler. -7. Add fake index registers, EIZ/RIZ, to x86 assembler/disassembler. -8. Improve x86 assembler error message for truncated values. PR 5026. -9. Remove a COFF assertion in COFF assembler. PR 5035. -10. Add AMD SSE5 support to x86 assembler/disassembler. -11. Fix x86 assembler for extrq/insertq in Intel mode. -12. Fix x86 disassembler for invalid opcodes in 64bit. PR 5072. -13. Fix auto-import in PE-COFF linker. PR 4844. -14. Correct -z now in ELF linker. -15. Fix a --build-id linker crash. PR 5025. -16. Improved x86 assembler/disassembler infrastructure for new -instruction support. -17. Fix various m68k bugs. -18. Fix various ppc bugs. -19. Fix various spu bugs. - -Changes from binutils 2.17.50.0.18: - -1. Update from binutils 2007 0908. -2. Fix an ELF linker for SHT_NOBITS sections. PR 2864/5006. -3. Improve TLS transition check in i386 and x86-64 linkers. -4. Fix a GD->LE/LD->LE TLS transition bug in i386 and x86-64 linkers. -PR 4918. -5. Update ELF linker to dump segment map when a section can't be allocated -in segment. PR 4909. -6. Clean up x86 disassembler to remove fixups and make it more -table driven. -7. Fix x86 disassember for SSE instructions in Intel mode. PR 4834. -8. Properly handle bss segments in ELF linker. -9. Add --string-dump to readelf. -10. Fix objcopy -R .debug_* --only-keep-debug regression. PR 4888. -11. Change x86 assembler to follow SVME specification. -12. Fix x86 assembler for cmpxchg8b, pextrb and pinsrb in Intel mode. -13. Update x86 assembler to better handle expressions with @GOT suffix. -PR 4079. -14. Properly handle section alignment >= 128 byte for PECOFF. -15. Fix an ELF linker --build-id option crash. PR 4923. -16. Fix binutils build on HP-UX. PR 4875. -17. Fix a regression of the a.out linker -N option. PR 4515. -18. Update x86 disassembler for invlpg, fxsave, fxrstor, ldmxcsr and -stmxcsr in Intel mode. -19. Fix x86 assembler for SSE4 instructions in Intel mode. -20. Fix various arm bugs. -21. Fix various mips bugs. -22. Fix various ppc bugs. -23. Fix various spu bugs. -24. Fix various xtensa bugs. - -Changes from binutils 2.17.50.0.17: - -1. Update from binutils 2007 0731. -2. Switching from GPLv2 to GPLv3. -3. Add a new ELF linker option, --build-id, to generate a unique -per-binary identifier embedded in a note section. -4. Remove COFF/x86-64 from PE-COFF/x86-64. -5. Fix a "nm -l" crash on DWARF info. PR 4797. -6. Match symbol type when creating symbol aliase in ELF shared library. -7. Fix addr2line on relocatable linux kernel. PR 4756. -8. Change disassembler to print addend as signed. -9. Support section alignment from 128 to 8192 bytes for PE-COFF. -10. Add attribute section to ELF linker. -11. Fix ELF linker to meet gABI alignment requirement. PR 4701. -12. Add support for reading in debug information via a .gnu_debuglink -section. -13. Fix string merge for ia64 linker. PR 4590. -14. Add --common to size to display total size for *COM* syms. -15. Fix "strip --strip-unneeded" on relocatable files. PR 4716. -16. Fix "objcopy/strip --only-keep-debug" for SHT_NOTE sections. -17. Fix objdump -S with unit-at-a-time. -18. Properly handle "-shared -pie" in linker. PR 4409. -19. Fix x86 disassembler in Intel mode for various SIMD instruction. -PRs 4667/4834. -20. Update x86-64 assembler to long nop sequence by default. -21. Fix --32 for x86-64 mingw assembler. -22. Fix a memory corruption in assembler. PR 4722. -22. Properly support 64bit PE-COFF on hosts where long isn't 64bit. -23. Add #line in generated linker source files. -24. Fix linker crash on SIZEOF. PR 4782. -27. Add CR16 support. -28. Add windmc tool for Windows. -29. Generate x86 instruction/register definitions from ascii tables. -30. Fix strip for Solaris. PR 4712. -31. Fix various mips bugs. -32. Fix various ppc bugs. -33. Fix various spu bugs. -34. Fix various xtensa bugs. - -Changes from binutils 2.17.50.0.16: - -1. Update from binutils 2007 0615. -2. Preserve section alignment for copy relocation. PR 4504. -3. Properly fix regression with objcopy --only-keep-debug. PR 4479. -4. Fix ELF eh frame handling. PR 4497. -5. Fix ia64 string merge. PR 4590. -5. Don't use PE target on EFI files nor EFI target on PE files. -6. Speed up linker with many input files. -7. Support cross compiling windres. PR 2737. -8. Fix various windres bugs. -9. Fix various arms bugs. -10. Fix various m68k bugs. -11. Fix various mips bugs. -12. Fix various ppc bugs. -13. Fix various sparc bugs. -14. Fix various spu bugs. -15. Fix various xtensa bugs. - -Changes from binutils 2.17.50.0.15: - -1. Update from binutils 2007 0511. -2. Fix objcopy --only-keep-debug and linker multiple BSS sections handling. -PR 4479. -3. Fix "readelf -s -D" for gnu hash. PR 4476. -4. Fix ia64 linker crash with --unresolved-symbols=ignore-all. PR 4409. -5. Improve crc32 support in x86 assembler/dissassembler. -6. Improve displacement handling in x86 dissassembler. PR 4430. -7. Correct PC relative displacement handling in x86-64 dissassembler for -Intel mode. PR 4429. -8. Fix various PPC bugs. -9. Fix various SPU bugs. -10. Fix various ARM bugs. -11. Fix various m68k bugs. -12. Fix various xtensa bugs. - -Changes from binutils 2.17.50.0.14: - -1. Update from binutils 2007 0418. -2. Support Intel SSE4 instructions. -3. Fix linker --fatal-warnings for --warn-shared-textrel. PR 4304. -4. Improve linker error message to identify linker script error -location. PR 4090. -5. Fix objcopy to allow removing all sections. PR 4348. -6. Don't print addresses of 32-bit targets as 64-bit values on 64bit -host. PR 4292. -7. Improve checking for corrupted input files. PR 4110. -8. Improve alpha linker performance. -9. Add a new linker option, -l:foo. -10. Fix a PPC linker bug. PR 4267. -11. Misc vxworks bug fixes. -12. Misc SH bug fixes. -13. Misc SPU bug fixes. -14. Misc ARM bug fixes. -15. Misc MIPS bug fixes. -16. Misc xtensa bug fixes. - -Changes from binutils 2.17.50.0.13: - -1. Update from binutils 2007 0322. -2. Fix >16byte nop padding regression in x86 assembler. -3. Fix x86-64 disassembler for xchg. PR 4218. -4. Optimize opcode for x86-64 xchg. -5. Allow register operand with x86 nop. -6. Properly handle holes between sections for PE-COFF. PR 4210. -7. Print more PE-COFF info for objdump -p. -8. Report missing matching LO16 relocation for HI16 relocation in mips -linker. -9. Use PC-relative relocation for Win64. -10. Fix strip for Solaris. PR 3535. -11. Fix a C++ demangler crash. -12. Some m32c update. -13. Fix misc ARM bugs. - -Changes from binutils 2.17.50.0.12: - -1. Update from binutils 2007 0315. -2. Add EFI/x86-64 support. -3. Fix ELF linker for relocation against STN_UNDEF. PR 3958. -4. Fix ELF linker for SHT_NOBITS section whose VMA > page size. PR 4144. -5. Make assembler and disassembler consistent for "test %eax,%ebx". PR -4027. -6. Fix i386 32bit address wraparound. PR 3966. -7. Allow Linux/i386 linker to read FreeBSD/i386 object files. -8. Fix ELF linker crash upon use of .gnu.warning.<symbol> sections. PR -3953. -9. Fix ELF linker to issue an error on bad section in segment. PR 4007. -10. Support enabling both x86_64-mingw32 and i386-mingw32. PR 3945. -11. Fix assembler to stabilize .gcc_except_table relaxation. PR 4029. -12. Fix a MIPS linker crash. PR 3852. -13. Fix readelf for h8300-elf. PR 3800. -14. Fix strip for Solaris. PR 3535. -15. Misc xtensa bug fixes. -16. Misc PPC bug fixes. -17. Misc SPU bug fixes. -18. Add support for Toshiba MeP. - -Changes from binutils 2.17.50.0.11: - -1. Update from binutils 2007 0128. -2. Remove duplicate code in x86 assembler. -3. Fix 32bit and 64bit HPPA/ELF. - -Changes from binutils 2.17.50.0.10: - -1. Update from binutils 2007 0125. -2. Support environment variables, LD_SYMBOLIC for -Bsymbolic and -LD_SYMBOLIC_FUNCTIONS for -Bsymbolic-functions. -3. Build binutils rpm with LD_SYMBOLIC_FUNCTIONS=1 and reduce PLT -relocations in libfd.so by 84%. -4. Enable sharable sections only for ia32, x86-64 and ia64. -5. Properly handle PT_GNU_RELRO segment for objcopy. - -Changes from binutils 2.17.50.0.9: - -1. Update from binutils 2007 0122. -2. Implement sharable section proposal for ia32, x86-64 and ia64: - -http://groups-beta.google.com/group/generic-abi - -3. Implement linker enhancement, -Bsymbolic-functions, ---dynamic-list-cpp-new and --dynamic-list-data. PR 3831. -4. Implement new linker switch, --default-script=FILE/-dT FILE. -5. Check EI_OSABI when reading ELF files. PR 3826. -6. Fix x86 assembler error message. PR 3830. -7. Fix a bug in ld testsuite. PR 1283. -8. Don't include archive64.o for 32bit target. PR 3631. -9. Support -z max-page-size and -z common-page-size in user provided -linker script. -10. Fix 32bit library support for GNU/kFreeBSD/x86-64. PR 3843. -11. Fix some bugs in Score assembler. PR 3871. -12. Fix various bugs in ARM assembler. PR 3707 and more. -13. Add Fido support. - -Changes from binutils 2.17.50.0.8: - -1. Update from binutils 2007 0103. -2. Fix --wrap linker bug. -3. Improve handling ELF binaries generated by foreign ELF linkers. -4. Various ELF M68K bug fixes. -5. Score bug fixes. -6. Don't read past end of archive elements. PR 3704. -7. Improve .eh_frame_hdr section handling. -8. Fix symbol visibility with comdat/linkonce sections in ELF linker. -PR 3666. -9. Fix 4 operand instruction handling in x86 assembler. -10. Properly check the 4th operand in x86 assembler. PR 3712. -11. Fix .cfi_endproc handling in assembler. PR 3607. -12. Various ARM bug fixes. -13. Various PE linker fixes. -14. Improve x86 dissassembler for cmpxchg16b. - -Changes from binutils 2.17.50.0.7: - -1. Update from binutils 2006 1201. -2. Fix "objcopy --only-keep-debug" crash. PR 3609. -3. Fix various ARM ELF bugs. -4. Fix various xtensa bugs. -5. Update x86 disassembler. - -Changes from binutils 2.17.50.0.6: - -1. Update from binutils 2006 1127. -2. Properly set ELF output segment address when the first section in -input segment is removed. -3. Better merging of CIEs in linker .eh_frame optimizations. -4. Support .cfi_personality and .cfi_lsda assembler directives. -5. Fix an ARM linker crash. PR 3532. -6. Fix various PPC64 ELF bugs. -7. Mark discarded debug info more thoroughly in linker output. -8. Fix various MIPS ELF bugs. -9. Fix readelf to display program interpreter path > 64 chars. PR 3384. -10. Add support for PowerPC SPU. -11. Properly handle cloned symbols used in relocations in assembler. PR -3469. -12. Update opcode for POPCNT in amdfam10 architecture. - -Changes from binutils 2.17.50.0.5: - -1. Update from binutils 2006 1020. -2. Don't make debug symbol dynamic. PR 3290. -3. Don't page align empty SHF_ALLOC sections, which leads to very large -executables. PR 3314. -4. Use a different section index for section relative symbols against -removed empty sections. -5. Fix a few ELF EH frame handling bugs. -6. Don't ignore relocation overflow on branches to undefweaks for -x86-64. PR 3283. -7. Rename MNI to SSSE3. -8. Properly append symbol list for --dynamic-list. -lists. -9. Various ARM ELF fixes. -10. Correct 64bit library search path for Linux/x86 linker with 64bit -support. -11. Fix ELF linker to copy OS/PROC specific flags from input section to -output section. -12. Fix DW_FORM_ref_addr handling in linker dwarf reader. PR 3191. -13. Fix ELF indirect symbol handling. PR 3351. -14. Fix PT_GNU_RELRO segment handling for SHF_TLS sections. Don't add -PT_GNU_RELRO segment when there are no relro sections. PR 3281. -15. Various MIPS ELF fixes. -16. Various Sparc ELF fixes. -17. Various Xtensa ELF fixes. - -Changes from binutils 2.17.50.0.4: - -1. Update from binutils 2006 0927. -2. Fix linker regressions of section address and section relative symbol -with empty output section. PR 3223/3267. -3. Fix "strings -T". PR 3257. -4. Fix "objcopy --only-keep-debug". PR 3262. -5. Add Intell iwmmxt2 support. -6. Fix an x86 disassembler bug. PR 3100. - -Changes from binutils 2.17.50.0.3: - -1. Update from binutils 2006 0924. -2. Speed up linker on .o files with debug info on linkonce sections. -PR 3111. -3. Added x86-64 PE support. -4. Fix objcopy/strip on .o files with section groups. PR 3181. -5. Fix "ld --hash-style=gnu" crash with gcc 3.4.6. PR 3197. -6. Fix "strip --strip-debug" on .o files generated with -"gcc -feliminate-dwarf2-dups". PR 3186. -7. Fix "ld -r" on .o files generated with "gcc -feliminate-dwarf2-dups". -PR 3249. -8. Add --dynamic-list to linker to make global symbols dynamic. -9. Fix magic number for EFI ia64. PR 3171. -10. Remove PT_NULL segment for "ld -z relro". PR 3015. -11. Make objcopy to perserve the file formats in archive elements. -PR 3110. -12. Optimize x86-64 assembler and fix disassembler for -"add32 mov xx,$eax". PR 3235. -13. Improve linker diagnostics. PR 3107. -14. Fix "ld --sort-section name". PR 3009. -15. Updated an x86 disassembler bug. PR 3000. -16. Various updates for PPC, ARM, MIPS, SH, Xtensa. -17. Added Score support. - -Changes from binutils 2.17.50.0.2: - -1. Update from binutils 2006 0715. -2. Add --hash-style to ELF linker with DT_GNU_HASH and SHT_GNU_HASH. -3. Fix a visibility bug in ELF linker (PR 2884). -4. Properly fix the i386 TLS linker bug (PR 2513). -5. Add assembler and dissassembler support for Pentium Pro nops. -6. Optimize x86 nops for Pentium Pro and above. -7. Add -march=/-mtune= to x86 assembler. -8. Fix an ELF linker with TLS common symbols. -9. Improve program header allocation in ELF linker. -10. Improve MIPS, M68K and ARM support. -11. Fix an ELF linker crash when reporting alignment change (PR 2735). -12. Remove unused ELF section symbols (PR 2723). -13. Add --localize-hidden to objcopy. -14. Add AMD SSE4a and ABM new instruction support. -15. Properly handle illegal x86 instructions in group 11 (PR 2829). -16. Add "-z max-page-size=" and "-z common-page-size=" to ELF linker. -17. Fix objcopy for .tbss sections. - -Changes from binutils 2.17.50.0.1: - -1. Update from binutils 2006 0526. -2. Change the x86-64 maximum page size to 2MB. -3. Support --enable-targets=all for 64bit target and host (PR 1485). -4. Properly update CIE/FDE length and align section for .eh_frame -section (PR 2655/2657). -5. Properly handle removed ELF section symbols. -6. Fix an ELF linker regression introduced on 2006-04-21. -7. Fix an segfault in PPC ELF linker (PR 2658). -8. Speed up the ELF linker by caching the result of kept section check. -9. Properly create stabs section for ELF. -10. Preserve ELF program header when copying ELF files. -11. Properly handle ELF SHN_LOPROC/SHN_HIOS when checking section -index (PR 2607). -12. Misc mips updates. -13. Misc arm updates. -14. Misc xtensa updates. -15. Fix an alpha assembler warning (PR 2598). -16. Fix assembler buffer overflow. -17. Properly disassemble sgdt/sidt for x86-64. - -Changes from binutils 2.16.91.0.7: - -1. Update from binutils 2006 0427. -2. Fix an objcopy regression (PR 2593). -3. Reduce ar memory usage (PR 2467). -4. Allow application specific ELF sections (PR 2537). -5. Fix an i386 TLS linker bug (PR 2513). -6. Speed up ia64 linker by 1300X in some cases (PR 2442). -7. Check illegal immediate register operand in i386 assembler (PR -2533). -8. Fix a strings bug (PR 2584). -9. Better handle corrupted ELF files (PR 2257). -10. Fix a MIPS linker bug (PR 2267). - -Changes from binutils 2.16.91.0.6: - -1. Update from binutils 2006 0317. -2. Support Intel Merom New Instructions in assembler/disassembler. -3. Support Intel new instructions in Montecito. -4. Fix linker "--as-needed" (PR 2434). -5. Fix linker "-s" regression (PR 2462). -6. Fix REP prefix for string instructions in x86 disassembler -(PR 2428). -7. Fix the weak undefined symbols in PIE (PR 2218). -8. Fix 2 DWARF reader bugs (PRs 2443, 2338). -9. Improve ELF linker error message (PR 2322). -10. Avoid abort with dynamic symbols in >64K sections (PR 2411). -11. Handle mismatched symbol types for executables (PR 2404). -12. Avoid a linker linkonce regression (PR 2342). - -Changes from binutils 2.16.91.0.5: - -1. Update from binutils 2006 0212. -2. Correct Linux linker search order for DT_NEEDED entries (PR 2290). -3. Fix the x86-64 disassembler for control/debug register moves. -4. Properly handle ELF strip/objcopy with unmodified program header -(PR 2258). -5. Improve ELF linker error handling when there are not enough room for -program headers (PR 2322). -6. Properly handle weak undefined symbols in PIE (PR 2218). -7. Support new i386/x86-64 TLS relocations. -8. Fix addr2line for linux kernel (PR 2096). -9. Fix an assembler memory leak with --statistics. -10. Avoid an ia64 assembler regression (PR 2117). - -Changes from binutils 2.16.91.0.4: - -1. Update from binutils 2005 1219. -2. Fix a MIPS linker regression (PR 1932). -3. Fix an objcopy bug for ia64 (PR 1991). -4. Fix a linker crash on bad input (PR 2008). -5. Fix 64bit monitor and mwait (PR 1874). - -Changes from binutils 2.16.91.0.3: - -1. Update from binutils 2005 1111. -2. Fix ELF orphan section handling (PR 1467) -3. Fix ELF section attribute handleing (PR 1487). -4. Fix IA64 unwind info dump for relocatable files. (PR 1436). -5. Add DWARF info dump to objdump. -6. Fix SHF_LINK_ORDER handling (PR 1321). -7. Don't allow "ld --just-symbols" on DSO (PR 1263). -8. Fix a "ld -u" crash on TLS symbol (PR 1301). -9. Fix an IA64 linker crash (PR 1247). -10. Fix a MIPS linker bug (PR 1150). -11. Fix a M68K linker bug (PR 1775). -12. Fix an ELF symbol versioning linker bug (PR 1540). -13. Improve linker error handling (PR 1208). -14. Add new SPARC processors to SunOS for objcopy (PR 1472). -15. Add "@file" to read options from a file. -16. Add assembler weakref support. - -Changes from binutils 2.16.91.0.2: - -1. Update from binutils 2005 0821. -2. Support x86-64 medium model. -3. Fix "objdump -S --adjust-vma=xxx" (PR 1179). -4. Reduce R_IA64_NONE relocations from R_IA64_LDXMOV relaxation. -5. Fix x86 linker regression for dosemu. -6. Add "readelf -t/--section-details" to display section details. -7. Fix "as -al=file" regression (PR 1118). - -Changes from binutils 2.16.91.0.1: - -1. Update from binutils 2005 0720. -2. Add Intel VMX support. -3. Add AMD SVME support. -4. Add x86-64 new relocations for medium model. -5. Fix a PIE regression (PR 975). -6. Fix an x86_64 signed 32bit displacement regression. -7. Fix PPC PLT (PR 1004). -8. Improve empty section removal. - -Changes from binutils 2.16.90.0.3: - -1. Update from binutils 2005 0622. -2. Fix a linker versioning bug exposed by gcc 4 (PR 1022/1023/1025). -3. Optimize ia64 br->brl relaxation (PR 834). -4. Improve linker empty section removal. -5. Fix DWARF 2 line number reporting (PR 990). -6. Fix DWARF 2 line number reporting regression on assembly file (PR -1000). - -Changes from binutils 2.16.90.0.2: - -1. Update from binutils 2005 0510. -2. Update ia64 assembler to support comdat group section generated by -gcc 4 (PR 940). -3. Fix a linker crash on bad input (PR 939). -4. Fix a sh64 assembler regression (PR 936). -5. Support linker script on executable (PR 882). -6. Fix the linker -pie regression (PR 878). -7. Fix an x86_64 disassembler bug (PR 843). -8. Fix a PPC linker regression. -9. Misc speed up. - -Changes from binutils 2.16.90.0.1: - -1. Update from binutils 2005 0429. -2. Fix an ELF linker regression (PR 815). -3. Fix an empty section removal related bug. -4. Fix an ia64 linker regression (PR 855). -5. Don't allow local symbol to be equated common/undefined symbols (PR -857). -6. Fix the ia64 linker to handle local dynamic symbol error reporting. -7. Make non-debugging reference to discarded section an error (PR 858). -8. Support Sparc/TLS. -9. Support rpm build with newer rpm. -10. Fix an alpha linker regression. -11. Fix the non-gcc build regression. - -Changes from binutils 2.15.94.0.2.2: - -1. Update from binutils 2005 0408. -2. The i386/x86_64 assemblers no longer accept instructions for moving -between a segment register and a 32bit memory location. -3. The x86_64 assembler now allows movq between a segment register and -a 64bit general purpose register. -4. 20x Speed up linker for input files with >64K sections. -5. Properly report ia64 linker relaxation failures. -6. Support tuning ia64 assembler for Itanium 2 processors. -7. Linker will remove empty unused output sections. -8. Add -N to readelf to display full section names. -9. Fix the ia64 linker to support linkonce text sections without unwind -sections. -10. More unwind directive checkings in the ia64 assembler. -11. Speed up linker with wildcard handling. -12. Fix readelf to properly dump .debug_ranges and .debug_loc sections. - -Changes from binutils 2.15.94.0.2: - -1. Fix greater than 64K section support in linker. -2. Properly handle i386 and x86_64 protected symbols in linker. -3. Fix readelf for LEB128 on 64bit hosts. -4. Speed up readelf for section group process. -5. Include ia64 texinfo pages. -6. Change ia64 assembler to check hint.b for Montecito. -7. Improve relaxation failure report in ia64 linker. -8. Fix ia64 linker to allow relax backward branch in the same section. - -Changes from binutils 2.15.94.0.1: - -1. Update from binutils 2004 1220. -2. Fix strip for TLS symbol references. - -Changes from binutils 2.15.92.0.2: - -1. Update from binutils 2004 1121. -2. Put ia64 .ctors/.dtors sections next to small data section for -Intel ia64 compiler. -3. Fix -Bdynamic/-Bstatic handling for linker script. -4. Provide more information on relocation overflow. -5. Add --sort-section to linker. -6. Support icc 8.1 unwind info in readelf. -7. Fix the infinite loop bug on bad input in the ia64 assembler. -8. Fix ia64 SECREL relocation in linker. -9. Fix a section group memory leak in readelf. - -Changes from binutils 2.15.91.0.2: - -1. Update from binutils 2004 0927. -2. Work around a section header bug in Intel ia64 compiler. -3. Fix an unwind directive bug in the ia64 assembler. -4. Fix various PPC bugs. -5. Update ARM support. -6. Fix an x86-64 linker warning while building Linux kernel. - -Changes from binutils 2.15.91.0.1: - -1. Update from binutils 2004 0727. -2. Fix the x86_64 linker to prevent non-PIC code in shared library. -3. Fix the ia64 linker to warn the relotable files which can't be -relaxed. -4. Fix the comdat group support. Allow mix single-member comdat group -with linkonce section. -5. Added --add-needed/--no-add-needed options to linker. -6. Fix the SHF_LINK_ORDER support. -7. Fix the ia64 assembler for multiple sections with the same name and -SHT_IA_64_UNWIND sections. -8. Fix the ia64 assembler for merge section and relaxation. - -Changes from binutils 2.15.90.0.3: - -1. Update from binutils 2004 0527. -2. Fix -x auto option in the ia64 assembler. -3. Add the AR check in the ia64 assembler. -4. Fix the section group support. -5. Add a new -z relro linker option. -6. Fix an exception section placement bug in linker. -7. Add .serialize.data and .serialize.instruction to the ia64 -assembler. - -Changes from binutils 2.15.90.0.2: - -1. Update from binutils 2004 0415. -2. Fix the linker for weak undefined symbol handling. -3. Fix the ELF/Sparc and ELF/Sparc64 linker for statically linking PIC -code. - -Changes from binutils 2.15.90.0.1.1: - -1. Update from binutils 2004 0412. -2. Add --as-needed/--no-as-needed to linker. -3. Fix -z defs in linker. -4. Always reserve the memory for ia64 dynamic linker. -5. Fix a race condition in ia64 lazy binding. - -Changes from binutils 2.15.90.0.1: - -1. Fixed an ia64 assembler bug. -2. Install the assembler man page. - -Changes from binutils 2.14.90.0.8: - -1. Update from binutils 2004 0303. -2. Fixed linker for undefined symbols with non-default visibility. -3. Sped up linker weakdef symbol handling. -4. Fixed mixing ELF32 and ELF64 object files in archive. -5. Added ia64 linker brl optimization. -6. Fixed ia64 linker to disallow invalid dynamic relocations. -7. Fixed DT_TEXTREL handling in ia64 linker. -8. Fixed alignment handling in ia64 assembler. -9. Improved ia64 assembler unwind table handling. - -Changes from binutils 2.14.90.0.7: - -1. Update from binutils 2004 0114. -2. Fixed an ia64 assembler unwind table bug. -3. Better handle IPF linker relaxation overflow. -4. Fixed misc PPC bugs. - -Changes from binutils 2.14.90.0.6: - -1. Update from binutils 2003 1029. -2. Allow type changes for undefined symbols. -3. Fix EH frame optimization. -4. Fix the check for undefined versioned symbol with wildcard. -5. Support generating code for Itanium. -6. Detect and warn bad symbol index. -7. Update IPF assemebler DV check. - -Changes from binutils 2.14.90.0.5: - -1. Update from binutils 2003 0820. -2. No longer use section names for ELF section types nor flags. -3. Fix some ELF/IA64 linker bugs. -4. Fix some ELF/ppc bugs. -5. Add archive support to readelf. - -Changes from binutils 2.14.90.0.4.1: - -1. Update from binutils 2003 0722. -2. Fix an ELF/mips linker bug. -3. Fix an ELF/hpppa linker bug. -4. Fix an ELF/ia64 assembler bug. -5. Fix a linkonce support with C++ debug. -6. A new working C++ demangler. -7. Various alpha, mips, ia64, ... bug fixes. -8. Support for the current gcc and glibc. - -Changes from binutils 2.14.90.0.4: - -1. Fix an ia64 assembler hint@pause bug. -2. Support Intel Prescott New Instructions. - -Changes from binutils 2.14.90.0.3: - -1. Work around the brain dead libtool. - -Changes from binutils 2.14.90.0.2: - -1. Update from binutils 2003 0523. -2. Fix 2 ELF visibility bugs. -3. Fix ELF/ppc linker bugs. - -Changes from binutils 2.14.90.0.1: - -1. Update from binutils 2003 0515. -2. Fix various ELF visibility bugs. -3. Fix some ia64 linker bugs. -4. Add more IAS compatibilities to ia64 assembler. - -Changes from binutils 2.13.90.0.20: - -1. Update from binutils 2003 0505. -2. Fix various ELF visibility bugs. -3. Fix some ia64 linker bugs. -4. Fix some ia64 assembler bugs. -5. Add some IAS compatibilities to ia64 assembler. -6. Fix ELF common symbol alignment. -7. Fix ELF weak symbol handling. - -Changes from binutils 2.13.90.0.18: - -1. Update from binutils 2003 0319. -2. Fix an ia64 linker brl relaxation bug. -3. Fix some ELF/ppc linker bugs. - -Changes from binutils 2.13.90.0.16: - -1. Update from binutils 2003 0121. -2. Fix an ia64 gas bug. -3. Fix some TLS bugs. -4. Fix some ELF/ppc bugs. -5. Fix an ELF/m68k bug. - -2. Include /usr/bin/c++filt. -Changes from binutils 2.13.90.0.14: - -1. Update from binutils 2002 1126. -2. Include /usr/bin/c++filt. -3. Fix "ld -r" with execption handling. - -Changes from binutils 2.13.90.0.10: - -1. Update from binutils 2002 1114. -2. Fix ELF/alpha bugs. -3. Fix an ELF/i386 assembler bug. - -Changes from binutils 2.13.90.0.4: - -1. Update from binutils 2002 1010. -2. More ELF/PPC linker bug fixes. -3. Fix an ELF/alpha linker bug. -4. Fix an ELF/sparc linker bug to support Solaris. -5. More TLS updates. - -Changes from binutils 2.13.90.0.3: - -1. Update from binutils 2002 0814. -2. Fix symbol versioning bugs for gcc 3.2. -3. Fix mips gas. - -Changes from binutils 2.13.90.0.2: - -1. Update from binutils 2002 0809. -2. Fix a mips gas compatibility bug. -3. Fix an x86 TLS bfd bug. -4. Fix an x86 PIC gas bug. -5. Improve symbol versioning support. - -The file list: - -1. binutils-2.18.50.0.9.tar.bz2. Source code. -2. binutils-2.18.50.0.8-2.18.50.0.9.diff.bz2. Patch against the - previous beta source code. -3. binutils-2.18.50.0.9.i686.tar.bz2. IA-32 binary tar ball for RedHat - EL 4. -4. binutils-2.18.50.0.9.ia64.tar.bz2. IA-64 binary tar ball for RedHat - EL 4. -5. binutils-2.18.50.0.9.x86_64.tar.bz2. X64_64 binary tar ball for RedHat - EL 4. - -The primary sites for the beta Linux binutils are: - -1. http://www.kernel.org/pub/linux/devel/binutils/ - -Thanks. - - -H.J. Lu -hjl.tools@gmail.com -08/23/2008 diff --git a/source/d/binutils/release.binutils-2.20.51.0.8 b/source/d/binutils/release.binutils-2.20.51.0.8 new file mode 100644 index 000000000..d3d2bd8a7 --- /dev/null +++ b/source/d/binutils/release.binutils-2.20.51.0.8 @@ -0,0 +1,491 @@ +This is the beta release of binutils 2.20.51.0.8 for Linux, which is +based on binutils 2010 0412 in CVS on sourceware.org plus various +changes. It is purely for Linux. + +All relevant patches in patches have been applied to the source tree. +You can take a look at patches/README to see what have been applied and +in what order they have been applied. + +Starting from the 2.20.51.0.4 release, no diffs against the previous +release will be provided. + +You can enable both gold and bfd ld with --enable-gold=both. Gold will +be installed as ld.gold and bfd ld will be installed as ld.bfd. By +default, ld.gold will be installed as ld. You can use the configure +option, --enable-gold=both/bfd to choose bfd ld as the default linker, +ld. IA-32 binary and X64_64 binary tar balls are configured with +--enable-gold=both/bfd --enable-plugins --enable-threads. + +Starting from the 2.18.50.0.4 release, the x86 assembler no longer +accepts + + fnstsw %eax + +fnstsw stores 16bit into %ax and the upper 16bit of %eax is unchanged. +Please use + + fnstsw %ax + +Starting from the 2.17.50.0.4 release, the default output section LMA +(load memory address) has changed for allocatable sections from being +equal to VMA (virtual memory address), to keeping the difference between +LMA and VMA the same as the previous output section in the same region. + +For + +.data.init_task : { *(.data.init_task) } + +LMA of .data.init_task section is equal to its VMA with the old linker. +With the new linker, it depends on the previous output section. You +can use + +.data.init_task : AT (ADDR(.data.init_task)) { *(.data.init_task) } + +to ensure that LMA of .data.init_task section is always equal to its +VMA. The linker script in the older 2.6 x86-64 kernel depends on the +old behavior. You can add AT (ADDR(section)) to force LMA of +.data.init_task section equal to its VMA. It will work with both old +and new linkers. The x86-64 kernel linker script in kernel 2.6.13 and +above is OK. + +The new x86_64 assembler no longer accepts + + monitor %eax,%ecx,%edx + +You should use + + monitor %rax,%ecx,%edx + +or + monitor + +which works with both old and new x86_64 assemblers. They should +generate the same opcode. + +The new i386/x86_64 assemblers no longer accept instructions for moving +between a segment register and a 32bit memory location, i.e., + + movl (%eax),%ds + movl %ds,(%eax) + +To generate instructions for moving between a segment register and a +16bit memory location without the 16bit operand size prefix, 0x66, + + mov (%eax),%ds + mov %ds,(%eax) + +should be used. It will work with both new and old assemblers. The +assembler starting from 2.16.90.0.1 will also support + + movw (%eax),%ds + movw %ds,(%eax) + +without the 0x66 prefix. Patches for 2.4 and 2.6 Linux kernels are +available at + +http://www.kernel.org/pub/linux/devel/binutils/linux-2.4-seg-4.patch +http://www.kernel.org/pub/linux/devel/binutils/linux-2.6-seg-5.patch + +The ia64 assembler is now defaulted to tune for Itanium 2 processors. +To build a kernel for Itanium 1 processors, you will need to add + +ifeq ($(CONFIG_ITANIUM),y) + CFLAGS += -Wa,-mtune=itanium1 + AFLAGS += -Wa,-mtune=itanium1 +endif + +to arch/ia64/Makefile in your kernel source tree. + +Please report any bugs related to binutils 2.20.51.0.8 to +hjl.tools@gmail.com + +and + +http://www.sourceware.org/bugzilla/ + +Changes from binutils 2.20.51.0.7: + +1. Update from binutils 2010 0412. +2. Don't bind unique symbol locally. PR 11434. +3. Add DWARF 4 support to linker and readelf. +4. Fix --no-export-dynamic for PIE. PR 11413. +5. Speed up x86 assembler. +6. Use memmove instead of memcpy to copy overlap memory in assembler. +PR 11456. +7. Improve gold. +8. Improve VMS support. +9. Improve PE support. +10. Add TI C6X support. +11. Improve arm support. +12. Improve cris support. +13. Improve ppc support. + +Changes from binutils 2.20.51.0.6: + +1. Update from binutils 2010 0318. +2. Don't set ELFOSABI_LINUX for undefined STT_GNU_IFUNC symbols. +3. Improve x86 assembler error messages. +4. Support vpermilp[ds] for x86. +5. Fix strip for group sections. +6. Fix objcopy for PE PIE. PR 11396. +7. Avoid 32bit overflow in linker. +8. Correct backslash quote logic in assembler. PR 11356. +9. Improve linker --section-start support. PR 11304. +10. Properly update LMA. PR 11219. +11. Don't combine .init_array/.fini_array sections for relocatable link. +12. Add Solaris Sparc/x86 linker support. +13. Support dumping .ARM.exidx/.ARM.extab. +14. Add STT_GNU_IFUNC support for Sparc. +15. Improve gold. +16. Improve arm support. +17. Improve avr support. +18. Improve mips support. +19. Improve ppc support. +20. Improve xtensa support. + +Changes from binutils 2.20.51.0.5: + +1. Update from binutils 2010 0205. +2. Support x86 XSAVE extended state core dump. +3. Add an option, -mavxscalar=, to x86 assembler to encoding AVX +scalar instructions with VL=256 and update x86 disassembler. +4. Add xsave64/xrstor64 to x86 assembler/disassembler. +5. Add all the possible aliases for VPCOM* insns to x86 assembler. +5. Fix --gc-sections to detect unresolved symbol in DSO. PR 11218. +6. Support number of ELF program segments > 64K. +7. Support BSD4.4 extended archive write. +8. Report error on bad section name with "objdump -j". PR 11225. +9. Linker now checks if all files are present and indicates those missing. +PR 4437. +10. Allow adding section from empy file with objcopy. +11. Update C++ demangler to support vector. +12. Improve gold. +13. Improve arm support. +14. Improve hppa support. +15. Improve ppc support. +16. Improve s390 support. + +Changes from binutils 2.20.51.0.4: + +1. Update from binutils 2010 0115. +2. Optimize x86 assembler/disassembler. +3. Add a new program, elfedit, to edit ELF files. PR 11131. +4. Add --dyn-syms to readelf. PR 11146. +5. Remove "Warning: " from objcopy error message. PR 11130. +6. Fix linker --gc-sections with undefined __start_XXX/__stop_XXX symbols. +PR 11133. +7. Fix linker --gc-sections with SHT_NOTE section. PR 11143. +8. Fix a c++filt bug. PR 11137. +9. Fix assembler listing. PR 11122. +10. Improve gold. Change --enable-gold to --enable-gold=[both[/{gold,bfd}]]. +11. Improve arm support. +12. Improve mips support. +13. Improve ppc support. +14. Improve MacOS support. + +Changes from binutils 2.20.51.0.3: + +1. Update from binutils 2009 1214. +2. Update x86 assembler to check lockable instructions for lock prefix. +3. Update x86 disassembler to display all prefixes. +4. Support AMD XOP new instructions. +5. Fix an x86 assembler regression on Intel syntax. PR 11037. +6. Improve ia64 linker relaxation. PR 10955. +7. Add --no-relax linker option. +8. Update readelf to dump .debug_pubtype sections. +9. Improve gold: + a. Support linking against STT_GNU_IFUNC symbols defined in + shared libraries. + b. Support linking with STB_GNU_UNIQUE symbols. +10. Improve arm support. +11. Improve m68k support. +12. Improve mips support. +13. Improve ppc support. + +Changes from binutils 2.20.51.0.2: + +1. Update from binutils 2009 1109. +2. Fix "ld -s -static" with STT_GNU_IFUNC symbols. PR 10911. +3. Fix file permission on PIE with objcopy. PR 10802. +4. Fix x86 Intel syntax assembler with relocation. PR 10856. +5. Fix x86 Intel syntax assembler with far jump. PR 10740. +6. Add AMD LWP support. +7. Renamed linker option --add-needed to --copy-dt-needed-entries. +8. Support enabling both ld and gold with --enable-gold=both and +--enable-linker=[bfd,gold]. +9. Improve gold. +10. Improve arm support. +11. Improve cris support. +12. Improve hppa support. +13. Improve m68k support. +14. Improve RX support. +15. Improve spu support. +16. Improve vax support. +17. Improve MacOS support. +18. Improve Windows support. + +Changes from binutils 2.20.51.0.1: + +1. Update from binutils 2009 1009. +2. Add .cfi_sections to assembler. +3. Fix a linker bug with local dynamic symbols. PR 10630. +4. Add DWARF-3/DWARF-4 support. +5. Fix the x86 assembler PIC bug. PR 10677. +6. Fix the x86-64 displacement assembler bug. PR 10636. +7. Fix the x86 assembler bug with Intel memory syntax. PR 10637. +8. Fix the x86 PIC assembler bug with Intel syntax. PR 10704. +9. Add RX support. +10. Improve gold. +11. Improve arm support. +12. Improve bfin support. +13. Improve cr16 support. +14. Improve m68k support. +15. Improve mips support. +16. Improve ppc support. + +Changes from binutils 2.19.51.0.14: + +1. Update from binutils 2009 0905. +2. Add Intel L1OM support. +3. Add MicroBlaze support. +4. Fix assembler for DWARF info without .file/.loc directives. PR 10531. +5. Improve -pie with TLS relocations on ia32 and x86-64. PRs 6443/10434. +6. Fix linker page size support. PR 10569. +7. Fix wildcard in linker version script. PR 10518. +8. Fix strip with STB_GNU_UNIQUE. PR 10492. +9. Fix strip on unwriteable files. PR 10364. +10. Fix crash with "ld --build-id /usr/lib/libc.a". PR 10555. +11. Fix linker for Linux kernel build. PR 10429. +12. Support string merge on .comment section. +13. Improve build with C++ compiler. +14. Improve gold. +15. Improve arm support. +16. Improve bfin support. +11. Improve m32c support. +17. Improve m68k support. +18. Improve mep support. +19. Improve mips support. +20. Improve ppc support. +21. Improve spu support. +22. Improve xtensa support. + +Changes from binutils 2.19.51.0.13: + +1. Update from binutils 2009 0722. +2. Fix linker for STT_GNU_IFUNC symbols in static executables. PR 10433. +3. Fix linker bug for Linux kernel build. PR 10429. + +Changes from binutils 2.19.51.0.12: + +1. Update from binutils 2009 0721. +2. Fix linker for undefined STT_GNU_IFUNC symbols. PR 10426. +3. Fix x86 assembler for nops in 64bit. PR 10420. +4. Add a new option, --insn-width, to objdump. +5. Improve arm support. +6. Improve mips support. +7. Improve gold support. + +Changes from binutils 2.19.51.0.11: + +1. Update from binutils 2009 0716. +2. Fix x86 assembler for jumping to local STT_GNU_IFUNC symbols. +3. Fix x86 linker for relocatable link with local STT_GNU_IFUNC symbols. +4. Implement ppc STT_GNU_IFUNC support. +5. Support x86 FMA4. +6. Fix linker regression with Linux kernel build. +7. Support unordered references in DWARF reader. +8. Improve PE/COFF support. +8. Improve arm support. +9. Improve m10300 support. +10. Improve ppc support. +11. Improve spu support. +12. Improve gold support. + +Changes from binutils 2.19.51.0.10: + +1. Update from binutils 2009 0627. +2. Fix strip on static executable with STT_GNU_IFUNC symbol. PR 10337. +3. Add STB_GNU_UNIQUE support. +4. Fix objcopy on empty file. PR 10321. +5. Fix debug section for PE-COFF. +6. Suport build with gcc 4.5.0. +7. Improve arm support. +8. Improve ppc support. +9. Improve m10300 support. +10. Improve mep support. +11. Improve MacOS support. +12. Improve gold support. + +Changes from binutils 2.19.51.0.9: + +1. Update from binutils 2009 0618. +2. Update STT_GNU_IFUNC symbol support. PR 10269/10270. +3. Fix an assembler CFI bug. PR 10255. +4. Improve objdump. PR 10263/10288 +5. Improve readelf. +6. Improve arm support. +7. Improve moxie support. +8. Improve spu support. +9. Improve vax support. +10. Improve COFF/PE support. +11. Improve MacOS support. + +Changes from binutils 2.19.51.0.8: + +1. Update from binutils 2009 0606. +2. Update STT_GNU_IFUNC symbol support. + +Changes from binutils 2.19.51.0.7: + +1. Update from binutils 2009 0603. +2. Fix STT_GNU_IFUNC symbol with pointer equality. + +Changes from binutils 2.19.51.0.6: + +1. Update from binutils 2009 0601. +2. Update STT_GNU_IFUNC support. PR 10205. +3. Fix x86 asssembler Intel syntax regression with '$'. PR 10198. + +Changes from binutils 2.19.51.0.5: + +1. Update from binutils 2009 0529. +2. Rewrite STT_GNU_IFUNC, R_386_IRELATIVE and R_X86_64_IRELATIVE linker +support for STT_GNU_IFUNC symbols in shared library, dynamic executable +and static executable. +3. Add plugin support. +4. Improve spu support. + +Changes from binutils 2.19.51.0.4: + +1. Update from binutils 2009 0525. +2. Add STT_GNU_IFUNC, R_386_IRELATIVE and R_X86_64_IRELATIVE support to +assembler and linker. +3. Add LD_AS_NEEDED support to linker. +4. Remove AMD SSE5 support. +5. A new Intel syntax parser in x86 assembler. +6. Add DWARF discriminator support. +7. Add --64 support for x86 PE/COFF assembler. +8. Support common symbol with alignment for PE/COFF. +9. Improve gold support. +10. Improve arm support. +11. Improve mep support. +12. Improve mips support. +13. Improve ppc support. +14. Improve spu support. + +Changes from binutils 2.19.51.0.3: + +1. Update from binutils 2009 0418. +2. Remove EFI targets and use PEI targets for EFI. Add --file-alignment, +--heap, --image-base, --section-alignment, --stack and --subsystem command +line options for objcopy. PR 10074. +3. Update linker to warn alternate ELF machine code. +4. Fix x86 linker TLS transition. PR 9938. +5. Improve DWARF dumper to check relocations against STT_SECTION +symbol. +6. Guard DWARF dumper on bad DWARF input. +7. Add EM_ETPU and EM_SLE9X. Reserve 3 ELF machine types for Intel. +8. Adding a linker missing entry symbol warning for -pie. PR 9970. +9. Make the -e option for linker to imply -u. PR 6766. +10. Properly handle paging for PEI targets. +11. Fix assembler listing with input from stdin. +12. Update objcopy/string to generate symbol table if there is any +relocation in output. PR 9945. +13. Require texinfo 4.7 for build. PR 10039. +14. Add moxie support. +15. Improve gold support. +16. Improve AIX support. +17. Improve arm support. +18. Improve cris support. +19. Improve crx support. +20. Improve mips support. +21. Improve ppc support. +22. Improve s390 support. +23. Improve spu support. +24. Improve vax support. + +Changes from binutils 2.19.51.0.2: + +1. Update from binutils 2009 0310. +2. Fix strip on common symbols in relocatable file. PR 9933. +3. Fix --enable-targets=all build. +4. Fix ia64 build with -Wformat-security. PR 9874. +5. Add REGION_ALIAS support in linker script. +6. Add think archive support to readelf. +7. Improve DWARF support in objdump. +8. Improve alpha support. +9. Improve arm support. +10. Improve hppa support. +11. Improve m68k support. +12. Improve mips support. +13. Improve ppc support. +14. Improve xtensa support. +15. Add score 7 support. + +Changes from binutils 2.19.51.0.1: + +1. Update from binutils 2009 0204. +2. Support AVX Programming Reference (January, 2009) +3. Improve .s suffix support in x86 disassembler. +4. Add --prefix/--prefix-strip for objdump -S. PR 9784. +5. Change "ld --as-needed" to resolve undefined references in DSO. +6. Add -Ttext-segment to ld to set address of text segment. +7. Fix "ld -r --gc-sections --entry" crash with COMDAT group. PR 9727. +8. Improve linker compatibility for g++ 3.4 `.gnu.linkonce.r.*. +9. Add VMS/ia64 support. +10. Improve arm support. +11. Improve cris support. +12. Improve m68k support. +13. Improve mips support. +14. Improve spu support. + +Changes from binutils 2.19.50.0.1: + +1. Update from binutils 2009 0106. +2. Support AVX Programming Reference (December, 2008) +2. Encode AVX insns with 2byte VEX prefix if possible. +4. Add .s suffix support to swap register operands to x86 assembler. +5. Properly select NOP insns for code alignment in x86 assembler. +6. Fix 2 symbol visibility linker bugs. PRs 9676/9679. +7. Fix an ia64 linker relaxation bug. PR 7036. +8. Fix a symbol versioning bug. PR 7047. +9. Fix unitialized data in linker. PR 7028. +10. Avoid a linker crash on bad input. PR 7023. +11. Fix a linker memory leak. PR 7012. +12. Fix strip/objcopy crash on PT_GNU_RELRO. PR 7011. +13. Improve MacOS support. +14. Fix a COFF linker bug. PR 6945. +15. Add LM32 support. +16. Fix various arm bugs. +17. Fix various avr bugs. +18. Fix various CR16 bugs. +19. Fix various cris bugs. +20. Fix various m32c bugs. +21. Fix various m68k bugs. +22. Fix various mips bugs. +23. Fix various ppc bugs. +24. Fix various s390 bugs. +25. Fix various sparc bugs. +26. Fix various spu bugs. +27. Fix various xtensa bugs. + +The file list: + +1. binutils-2.20.51.0.8.tar.bz2. Source code. +2. binutils-2.20.51.0.8.i686.tar.bz2. IA-32 binary tar ball for RedHat + EL 5. +3. binutils-2.20.51.0.8.ia64.tar.bz2. IA-64 binary tar ball for RedHat + EL 5. +4. binutils-2.20.51.0.8.x86_64.tar.bz2. X64_64 binary tar ball for RedHat + EL 5. + +The primary sites for the beta Linux binutils are: + +1. http://www.kernel.org/pub/linux/devel/binutils/ + +Thanks. + + +H.J. Lu +hjl.tools@gmail.com +04/13/2010 diff --git a/source/d/bison/bison.SlackBuild b/source/d/bison/bison.SlackBuild index f99d23302..d41436251 100755 --- a/source/d/bison/bison.SlackBuild +++ b/source/d/bison/bison.SlackBuild @@ -21,10 +21,21 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -VERSION=2.4.1 -ARCH=${ARCH:-x86_64} +VERSION=2.4.2 BUILD=${BUILD:-1} +NUMJOBS=${NUMJOBS:--j6} + +# Automatically determine the architecture we're building on: +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) export ARCH=i486 ;; + arm*) export ARCH=arm ;; + # Unless $ARCH is already set, use uname -m for all other archs: + *) export ARCH=$( uname -m ) ;; + esac +fi + CWD=$(pwd) TMP=${TMP:-/tmp} PKG=$TMP/package-bison @@ -38,6 +49,9 @@ elif [ "$ARCH" = "s390" ]; then elif [ "$ARCH" = "x86_64" ]; then SLKCFLAGS="-O2 -fPIC" LIBDIRSUFFIX="64" +else + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" fi rm -rf $PKG @@ -61,7 +75,7 @@ CFLAGS="$SLKCFLAGS" \ --mandir=/usr/man \ --infodir=/usr/info -make -j3 || exit 1 +make $NUMJOBS || make || exit 1 make install DESTDIR=$PKG find $PKG | xargs file | grep -e "executable" -e "shared object" \ @@ -73,7 +87,7 @@ gzip -9 $PKG/usr/man/man1/bison.1 mkdir -p $PKG/usr/doc/bison-$VERSION cp -a \ - ABOUT-NLS AUTHORS COPYING* INSTALL NEWS README REFERENCES THANKS doc/FAQ \ + AUTHORS COPYING* INSTALL NEWS README REFERENCES THANKS doc/FAQ \ $PKG/usr/doc/bison-$VERSION mkdir -p $PKG/install diff --git a/source/d/clisp/clisp.SlackBuild b/source/d/clisp/clisp.SlackBuild index 49e4f768d..4d6b43f48 100755 --- a/source/d/clisp/clisp.SlackBuild +++ b/source/d/clisp/clisp.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2008, 2009 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2008, 2009, 2010 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -21,15 +21,23 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -VERSION=2.47 -DIRNAME=2.47 -ARCH=${ARCH:-x86_64} -NUMJOBS=${NUMJOBS:-" -j7 "} -BUILD=${BUILD:-2} +VERSION=2.48 +DIRNAME=2.48 +BUILD=${BUILD:-1} # Bundled libraries: FFCALLVER=20080704cvs -LIBSIGSEVVER=2.6 +LIBSIGSEVVER=2.8 + +# Automatically determine the architecture we're building on: +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) export ARCH=i486 ;; + arm*) export ARCH=arm ;; + # Unless $ARCH is already set, use uname -m for all other archs: + *) export ARCH=$( uname -m ) ;; + esac +fi if [ "$ARCH" = "i486" ]; then SLKCFLAGS="-O2 -march=i486 -mtune=i686" @@ -40,8 +48,13 @@ elif [ "$ARCH" = "s390" ]; then elif [ "$ARCH" = "x86_64" ]; then SLKCFLAGS="-O2 -fPIC" LIBDIRSUFFIX="64" +else + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" fi +NUMJOBS=${NUMJOBS:-" -j7 "} + CWD=$(pwd) TMP=${TMP:-/tmp} PKG=$TMP/package-clisp @@ -53,7 +66,7 @@ mkdir -p $TMP $PKG # First we need this. It used to ship with CLISP, but no longer does. cd $TMP rm -rf libsigsegv-$LIBSIGSEVVER -tar xvf $CWD/libsigsegv-$LIBSIGSEVVER.tar.bz2 || exit 1 +tar xvf $CWD/libsigsegv-$LIBSIGSEVVER.tar.?z* || exit 1 cd libsigsegv-$LIBSIGSEVVER || exit 1 chown -R root:root . find . \ diff --git a/source/d/cmake/cmake.SlackBuild b/source/d/cmake/cmake.SlackBuild index 4a05c76e9..25fd3b4f2 100755 --- a/source/d/cmake/cmake.SlackBuild +++ b/source/d/cmake/cmake.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2008, 2009 Patrick J. Volkerding, Sebeka, Minnesota, USA +# Copyright 2008, 2009, 2010 Patrick J. Volkerding, Sebeka, Minnesota, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -20,12 +20,21 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -NAME=cmake +PKGNAM=cmake +VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} +BUILD=${BUILD:-1} + +# Automatically determine the architecture we're building on: +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) export ARCH=i486 ;; + arm*) export ARCH=arm ;; + # Unless $ARCH is already set, use uname -m for all other archs: + *) export ARCH=$( uname -m ) ;; + esac +fi -VERSION=${VERSION:-2.6.2} -ARCH=${ARCH:-x86_64} NUMJOBS=${NUMJOBS:-" -j7 "} -BUILD=${BUILD:-2} if [ "$ARCH" = "i486" ]; then SLKCFLAGS="-O2 -m32 -march=i486 -mtune=i686" @@ -33,19 +42,21 @@ elif [ "$ARCH" = "s390" ]; then SLKCFLAGS="-O2" elif [ "$ARCH" = "x86_64" ]; then SLKCFLAGS="-O2 -fPIC" +else + SLKCFLAGS="-O2" fi CWD=$(pwd) TMP=${TMP:-/tmp} -PKG=$TMP/package-$NAME +PKG=$TMP/package-$PKGNAM rm -rf $PKG mkdir -p $TMP $PKG cd $TMP -rm -rf $NAME-$VERSION -tar xvf $CWD/$NAME-$VERSION.tar.bz2 || exit 1 -cd $NAME-$VERSION +rm -rf $PKGNAM-$VERSION +tar xvf $CWD/$PKGNAM-$VERSION.tar.?z* || exit 1 +cd $PKGNAM-$VERSION chown -R root:root . find . \ @@ -63,13 +74,21 @@ CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ../configure \ --prefix=/usr \ - --docdir=/doc/$NAME-$VERSION \ + --docdir=/doc/$PKGNAM-$VERSION \ $SLKCONFIGFLAGS \ --build=$ARCH-slackware-linux make $NUMJOBS || make || exit 1 make install DESTDIR=$PKG || exit 1 +# If there's a ChangeLog, installing at least part of the recent history +# is useful, but don't let it get totally out of control: +if [ -r ../ChangeLog.txt ]; then + DOCSDIR=$(echo $PKG/usr/doc/${PKGNAM}-$VERSION) + cat ../ChangeLog.txt | head -n 1000 > $DOCSDIR/ChangeLog.txt + touch -r ../ChangeLog.txt $DOCSDIR/ChangeLog.txt +fi + # Compress and link manpages, if any: if [ -d $PKG/usr/man ]; then ( cd $PKG/usr/man @@ -92,5 +111,5 @@ mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc cd $PKG -/sbin/makepkg -l y -c n $TMP/$NAME-$VERSION-$ARCH-$BUILD.txz +/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz diff --git a/source/d/cscope/cscope.SlackBuild b/source/d/cscope/cscope.SlackBuild index 76994691f..21e86d3f0 100755 --- a/source/d/cscope/cscope.SlackBuild +++ b/source/d/cscope/cscope.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2008, 2009 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2008, 2009, 2010 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -23,14 +23,24 @@ PKGNAM=cscope VERSION=${VERSION:-$(echo $(basename $(echo $PRGNAM-*.tar.bz2 | cut -f 2 -d -) .tar.bz2) | cut -f 2 -d -)} -ARCH=${ARCH:-x86_64} -NUMJOBS=${NUMJOBS:-" -j7 "} -BUILD=${BUILD:-2} +BUILD=${BUILD:-1} + +# Automatically determine the architecture we're building on: +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) export ARCH=i486 ;; + arm*) export ARCH=arm ;; + # Unless $ARCH is already set, use uname -m for all other archs: + *) export ARCH=$( uname -m ) ;; + esac +fi CWD=$(pwd) TMP=${TMP:-/tmp} PKG=$TMP/package-cscope +NUMJOBS=${NUMJOBS:-" -j7 "} + rm -rf $PKG mkdir -p $TMP $PKG @@ -47,6 +57,7 @@ find . \ ./configure \ --prefix=/usr \ + --mandir=/usr/man \ --build=${ARCH}-slackware-linux make $NUMJOBS || make || exit 1 @@ -59,9 +70,17 @@ gzip -9 $PKG/usr/man/man1/${PKGNAM}.1 mkdir -p $PKG/usr/doc/${PKGNAM}-$VERSION cp -a \ - AUTHORS COPYING* INSTALL NEWS README TODO \ + AUTHORS COPYING* INSTALL NEWS README* TODO \ $PKG/usr/doc/${PKGNAM}-$VERSION +# If there's a ChangeLog, installing at least part of the recent history +# is useful, but don't let it get totally out of control: +if [ -r ChangeLog ]; then + DOCSDIR=$(echo $PKG/usr/doc/${PKGNAM}-$VERSION) + cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog + touch -r ChangeLog $DOCSDIR/ChangeLog +fi + mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc diff --git a/source/d/doxygen/doxygen.SlackBuild b/source/d/doxygen/doxygen.SlackBuild index ec827f7cd..66ae4d360 100755 --- a/source/d/doxygen/doxygen.SlackBuild +++ b/source/d/doxygen/doxygen.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2008, 2009 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2008, 2009, 2010 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -21,18 +21,33 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -VERSION=1.5.8 -ARCH=${ARCH:-x86_64} +VERSION=${VERSION:-$(basename $(echo doxygen-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev) .src)} BUILD=${BUILD:-1} NUMJOBS=${NUMJOBS:-" -j7 "} +# Automatically determine the architecture we're building on: +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) export ARCH=i486 ;; + arm*) export ARCH=arm ;; + # Unless $ARCH is already set, use uname -m for all other archs: + *) export ARCH=$( uname -m ) ;; + esac +fi + if [ "$ARCH" = "i486" ]; then SLKCFLAGS="-O2 -march=i486 -mtune=i686" + LIBDIRSUFFIX="" elif [ "$ARCH" = "i686" ]; then SLKCFLAGS="-O2 -march=i686 -mtune=i686" + LIBDIRSUFFIX="" elif [ "$ARCH" = "x86_64" ]; then SLKCFLAGS="-O2 -fPIC" + LIBDIRSUFFIX="64" +else + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" fi CWD=$(pwd) @@ -45,7 +60,6 @@ cd $TMP rm -rf doxygen-$VERSION tar xvf $CWD/doxygen-${VERSION}.src.tar.?z* || exit 1 cd doxygen-$VERSION -zcat $CWD/doxygen.qt4.diff.gz | patch -p1 --verbose || exit 1 chown -R root:root . find . \ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ @@ -53,11 +67,9 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; -# We want qt4 to be found, not qt3 if that is available as well: -unset QTDIR - CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ +QTDIR=/usr/lib${LIBDIRSUFFIX}/qt \ ./configure \ --shared \ --release \ diff --git a/source/d/doxygen/doxygen.qt4.diff b/source/d/doxygen/doxygen.qt4.diff deleted file mode 100644 index d55dced8f..000000000 --- a/source/d/doxygen/doxygen.qt4.diff +++ /dev/null @@ -1,12 +0,0 @@ -diff -up doxygen-1.5.8/configure.qt4 doxygen-1.5.8/configure ---- doxygen-1.5.8/configure.qt4 2008-12-26 20:22:39.000000000 +0100 -+++ doxygen-1.5.8/configure 2009-02-06 11:00:44.000000000 +0100 -@@ -268,7 +268,7 @@ if test "$f_wizard" = YES; then - if test -z "$QTDIR"; then - echo " QTDIR environment variable not set!" - echo -n " Checking for Qt..." -- for d in /usr/{lib,share,qt}/{qt-4,qt4,qt,qt*,4}; do -+ for d in /usr/{lib64,lib,share,qt}/{qt-4,qt4,qt,qt*,4}; do - if test -x "$d/bin/qmake"; then - QTDIR=$d - fi diff --git a/source/d/gcc/gcc.SlackBuild b/source/d/gcc/gcc.SlackBuild index cc1745aca..b11a7c6c8 100755 --- a/source/d/gcc/gcc.SlackBuild +++ b/source/d/gcc/gcc.SlackBuild @@ -2,7 +2,7 @@ # GCC package build script (written by volkerdi@slackware.com) # # Copyright 2003, 2004 Slackware Linux, Inc., Concord, California, USA -# Copyright 2005, 2006, 2007, 2008, 2009 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2005, 2006, 2007, 2008, 2009, 2010 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -42,14 +42,24 @@ # I see no reason to continue 386 support in the latest Slackware (and indeed # it's no longer easily possible). -VERSION=4.3.3 -ARCH=${ARCH:-x86_64} -TARGET=$ARCH-slackware-linux -BUILD=${BUILD:-4} +VERSION=4.4.4 +BUILD=${BUILD:-1} # How many jobs to run in parallel: NUMJOB=" -j 4 " +# Automatically determine the architecture we're building on: +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) export ARCH=i486 ;; + arm*) export ARCH=arm ;; + # Unless $ARCH is already set, use uname -m for all other archs: + *) export ARCH=$( uname -m ) ;; + esac +fi + +TARGET=$ARCH-slackware-linux + if [ "$ARCH" = "i386" ]; then SLKCFLAGS="-O2 -march=i386 -mcpu=i686" LIBDIRSUFFIX="" @@ -68,6 +78,9 @@ elif [ "$ARCH" = "s390" ]; then elif [ "$ARCH" = "x86_64" ]; then SLKCFLAGS="-O2 -fPIC" LIBDIRSUFFIX="64" +else + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" fi CWD=$(pwd) @@ -119,14 +132,25 @@ cp $CWD/ecj-4.3.jar gcc-$VERSION/ecj.jar find . -perm 754 -exec chmod 755 {} \; find . -perm 664 -exec chmod 644 {} \; mkdir -p $PKG1/usr/doc/gcc-$VERSION - # Only the most recent ChangeLog... shouldn't be too big. :) cp -a \ - BUGS COPYING* ChangeLog \ + BUGS COPYING* \ ChangeLog.tree-ssa FAQ INSTALL \ - LAST_UPDATED MAINTAINERS NEWS \ + LAST_UPDATED MAINTAINERS \ README* *.html \ $PKG1/usr/doc/gcc-$VERSION + # We will keep part of these, but they are really big... + if [ -r ChangeLog ]; then + DOCSDIR=$(echo $PKG1/usr/doc/gcc-$VERSION) + cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog + touch -r ChangeLog $DOCSDIR/ChangeLog + fi + if [ -r NEWS ]; then + DOCSDIR=$(echo $PKG1/usr/doc/gcc-$VERSION) + cat NEWS | head -n 1000 > $DOCSDIR/NEWS + touch -r NEWS $DOCSDIR/NEWS + fi + mkdir -p $PKG1/usr/doc/gcc-${VERSION}/gcc ( cd gcc cp -a \ @@ -135,93 +159,123 @@ cp $CWD/ecj-4.3.jar gcc-$VERSION/ecj.jar mkdir -p $PKG3/usr/doc/gcc-${VERSION}/gcc/fortran ( cd fortran - cp -a \ - ChangeLog \ - $PKG3/usr/doc/gcc-$VERSION/gcc/fortran/ChangeLog + if [ -r ChangeLog ]; then + cat ChangeLog | head -n 1000 > $PKG3/usr/doc/gcc-$VERSION/gcc/fortran/ChangeLog + touch -r ChangeLog $PKG3/usr/doc/gcc-$VERSION/gcc/fortran/ChangeLog + fi ) mkdir -p $PKG4/usr/doc/gcc-${VERSION}/gcc/ada ( cd ada cp -a \ - ChangeLog ChangeLog.tree-ssa \ + ChangeLog.tree-ssa \ $PKG4/usr/doc/gcc-$VERSION/gcc/ada + if [ -r ChangeLog ]; then + cat ChangeLog | head -n 1000 > $PKG4/usr/doc/gcc-$VERSION/gcc/ada/ChangeLog + touch -r ChangeLog $PKG4/usr/doc/gcc-$VERSION/gcc/ada/ChangeLog + fi ) mkdir -p $PKG5/usr/doc/gcc-${VERSION}/gcc/java ( cd java cp -a \ - ChangeLog ChangeLog.tree-ssa \ + ChangeLog.tree-ssa \ $PKG5/usr/doc/gcc-${VERSION}/gcc/java + if [ -r ChangeLog ]; then + cat ChangeLog | head -n 1000 > $PKG5/usr/doc/gcc-${VERSION}/gcc/java/ChangeLog + touch -r ChangeLog $PKG5/usr/doc/gcc-${VERSION}/gcc/java/ChangeLog + fi ) mkdir -p $PKG6/usr/doc/gcc-${VERSION}/gcc/objc ( cd objc cp -a \ - ChangeLog README \ + README* \ $PKG6/usr/doc/gcc-${VERSION}/gcc/objc + if [ -r ChangeLog ]; then + cat ChangeLog | head -n 1000 > $PKG6/usr/doc/gcc-${VERSION}/gcc/objc/ChangeLog + touch -r ChangeLog $PKG6/usr/doc/gcc-${VERSION}/gcc/objc/ChangeLog + fi ) ) || exit 1 mkdir -p $PKG3/usr/doc/gcc-${VERSION}/libgfortran ( cd libgfortran - cp -a \ - ChangeLog \ - $PKG3/usr/doc/gcc-${VERSION}/libgfortran/ChangeLog + if [ -r ChangeLog ]; then + cat ChangeLog | head -n 1000 > $PKG3/usr/doc/gcc-${VERSION}/libgfortran/ChangeLog + touch -r ChangeLog $PKG3/usr/doc/gcc-${VERSION}/libgfortran/ChangeLog + fi ) mkdir -p $PKG3/usr/doc/gcc-${VERSION}/libada ( cd libada - cp -a \ - ChangeLog \ - $PKG3/usr/doc/gcc-${VERSION}/libada + if [ -r ChangeLog ]; then + cat ChangeLog | head -n 1000 > $PKG3/usr/doc/gcc-${VERSION}/libada/ChangeLog + touch -r ChangeLog $PKG3/usr/doc/gcc-${VERSION}/libada/ChangeLog + fi ) mkdir -p $PKG5/usr/doc/gcc-${VERSION}/libffi ( cd libffi cp -a \ - ChangeLog ChangeLog.libgcj ChangeLog.v1 \ - LICENSE README \ + ChangeLog.libgcj ChangeLog.v1 \ + LICENSE* README* \ $PKG5/usr/doc/gcc-${VERSION}/libffi + if [ -r ChangeLog ]; then + cat ChangeLog | head -n 1000 > $PKG5/usr/doc/gcc-${VERSION}/libffi/ChangeLog + touch -r ChangeLog $PKG5/usr/doc/gcc-${VERSION}/libffi/ChangeLog + fi ) mkdir -p $PKG5/usr/doc/gcc-${VERSION}/libjava ( cd libjava cp -a \ - COPYING* ChangeLog HACKING LIBGCJ_LICENSE \ - NEWS README THANKS \ + COPYING* HACKING LIBGCJ_LICENSE \ + NEWS README* THANKS \ $PKG5/usr/doc/gcc-${VERSION}/libjava + if [ -r ChangeLog ]; then + cat ChangeLog | head -n 1000 > $PKG5/usr/doc/gcc-${VERSION}/libjava/ChangeLog + touch -r ChangeLog $PKG5/usr/doc/gcc-${VERSION}/libjava/ChangeLog + fi ) mkdir -p $PKG1/usr/doc/gcc-${VERSION}/libmudflap ( cd libmudflap - cp -a \ - ChangeLog \ - $PKG1/usr/doc/gcc-${VERSION}/libmudflap + if [ -r ChangeLog ]; then + cat ChangeLog | head -n 1000 > $PKG1/usr/doc/gcc-${VERSION}/libmudflap/ChangeLog + touch -r ChangeLog $PKG1/usr/doc/gcc-${VERSION}/libmudflap/ChangeLog + fi ) mkdir -p $PKG1/usr/doc/gcc-${VERSION}/libgomp ( cd libgomp - cp -a \ - ChangeLog \ - $PKG1/usr/doc/gcc-${VERSION}/libgomp + if [ -r ChangeLog ]; then + cat ChangeLog | head -n 1000 > $PKG1/usr/doc/gcc-${VERSION}/libgomp/ChangeLog + touch -r ChangeLog $PKG1/usr/doc/gcc-${VERSION}/libgomp/ChangeLog + fi ) mkdir -p $PKG6/usr/doc/gcc-${VERSION}/libobjc ( cd libobjc + if [ -r ChangeLog ]; then + cat ChangeLog | head -n 1000 > $PKG6/usr/doc/gcc-${VERSION}/libobjc/ChangeLog + touch -r ChangeLog $PKG6/usr/doc/gcc-${VERSION}/libobjc/ChangeLog + fi cp -a \ - ChangeLog README README.threads THREADS THREADS.MACH \ + README* THREADS* \ $PKG6/usr/doc/gcc-${VERSION}/libobjc ) mkdir -p $PKG2/usr/doc/gcc-${VERSION}/libstdc++-v3 ( cd libstdc++-v3 cp -a \ - ChangeLog README \ - $PKG2/usr/doc/gcc-${VERSION}/libstdc++-v3 - - cp -a \ + README* \ docs/html/faq \ $PKG2/usr/doc/gcc-${VERSION}/libstdc++-v3 + if [ -r ChangeLog ]; then + cat ChangeLog | head -n 1000 > $PKG2/usr/doc/gcc-${VERSION}/libstdc++-v3/ChangeLog + touch -r ChangeLog $PKG2/usr/doc/gcc-${VERSION}/libstdc++-v3/ChangeLog + fi ) ) # build gcc @@ -253,6 +307,7 @@ cp $CWD/ecj-4.3.jar gcc-$VERSION/ecj.jar --enable-threads=posix \ --enable-checking=release \ --with-system-zlib \ + --with-python-dir=/lib$LIBDIRSUFFIX/python2.6/site-packages \ --disable-libunwind-exceptions \ --enable-__cxa_atexit \ --enable-libssp \ @@ -409,6 +464,7 @@ fi # gcc-java: ( cd $PKG5 mkdir -p usr/bin + mv $PKG1/usr/bin/aot-compile usr/bin mv $PKG1/usr/bin/addr2name.awk usr/bin # mv $PKG1/usr/bin/fastjar usr/bin mv $PKG1/usr/bin/gappletviewer usr/bin @@ -430,7 +486,9 @@ fi mv $PKG1/usr/bin/jcf-dump usr/bin mv $PKG1/usr/bin/jv-* usr/bin mv $PKG1/usr/bin/rmi* usr/bin - mkdir -p usr/include + mkdir -p usr/include/c++/$VERSION + # Move some Java only C++ headers from the C++ package: + mv $PKG2/usr/include/c++/$VERSION/{gcj,gnu,java,javax,org,sun} usr/include/c++/$VERSION mv $PKG1/usr/include/ffi.h usr/include mkdir -p usr/lib${LIBDIRSUFFIX}/gcc/$TARGET/$VERSION/include mv $PKG1/usr/lib${LIBDIRSUFFIX}/gcc/$TARGET/$VERSION/include/jawt.h usr/lib${LIBDIRSUFFIX}/gcc/$TARGET/$VERSION/include @@ -441,6 +499,12 @@ fi mv $PKG1/usr/lib${LIBDIRSUFFIX}/gcc/$TARGET/$VERSION/include/jni_md.h usr/lib${LIBDIRSUFFIX}/gcc/$TARGET/$VERSION/include mv $PKG1/usr/lib${LIBDIRSUFFIX}/gcc/$TARGET/$VERSION/include/jvmpi.h usr/lib${LIBDIRSUFFIX}/gcc/$TARGET/$VERSION/include mv $PKG1/usr/lib${LIBDIRSUFFIX}/gcc/$TARGET/$VERSION/include/libffi usr/lib${LIBDIRSUFFIX}/gcc/$TARGET/$VERSION/include + # aot-compile Python plugins: + if [ ! -d $PKG1/usr/lib${LIBDIRSUFFIX}/python2.6 ]; then + echo "NO $PKG1/usr/lib${LIBDIRSUFFIX}/python2.6 !" + exit 1 + fi + mv $PKG1/usr/lib${LIBDIRSUFFIX}/python2.6 usr/lib${LIBDIRSUFFIX} mkdir -p usr/info mv $PKG1/usr/info/gcj.* usr/info # mv $PKG1/usr/info/fastjar.* usr/info @@ -462,6 +526,7 @@ fi mkdir -p usr/lib${LIBDIRSUFFIX}/gcc/$TARGET/$VERSION/include mv $PKG1/usr/lib${LIBDIRSUFFIX}/gcc/$TARGET/$VERSION/include/gcj usr/lib${LIBDIRSUFFIX}/gcc/$TARGET/$VERSION/include mkdir -p usr/man/man1 + mv $PKG1/usr/man/man1/aot-compile.1.gz usr/man/man1 mv $PKG1/usr/man/man1/gappletviewer.1.gz usr/man/man1 mv $PKG1/usr/man/man1/gc-analyze.1.gz usr/man/man1 mv $PKG1/usr/man/man1/gcj.1.gz usr/man/man1 @@ -471,6 +536,7 @@ fi mv $PKG1/usr/man/man1/gjar.1.gz usr/man/man1 mv $PKG1/usr/man/man1/gjarsigner.1.gz usr/man/man1 mv $PKG1/usr/man/man1/gjavah.1.gz usr/man/man1 + mv $PKG1/usr/man/man1/gjdoc.1.gz usr/man/man1 mv $PKG1/usr/man/man1/gjnih.1.gz usr/man/man1 mv $PKG1/usr/man/man1/gkeytool.1.gz usr/man/man1 mv $PKG1/usr/man/man1/gnative2ascii.1.gz usr/man/man1 @@ -483,6 +549,7 @@ fi mv $PKG1/usr/man/man1/jcf-dump.1.gz usr/man/man1 mv $PKG1/usr/man/man1/jv-convert.1.gz usr/man/man1 mv $PKG1/usr/man/man1/jv-scan.1.gz usr/man/man1 + mv $PKG1/usr/man/man1/rebuild-gcj-db.1.gz usr/man/man1 mkdir -p usr/share mv $PKG1/usr/share/java usr/share ) diff --git a/source/d/gdb/gdb.SlackBuild b/source/d/gdb/gdb.SlackBuild index ea55ec9dd..cad8c97ce 100755 --- a/source/d/gdb/gdb.SlackBuild +++ b/source/d/gdb/gdb.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2008, 2009 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2008, 2009, 2010 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -21,10 +21,21 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -VERSION=${VERSION:-6.8} -ARCH=${ARCH:-x86_64} +PKGNAM=gdb +VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} +BUILD=${BUILD:-1} + NUMJOBS=${NUMJOBS:-" -j7 "} -BUILD=${BUILD:-2} + +# Automatically determine the architecture we're building on: +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) export ARCH=i486 ;; + arm*) export ARCH=arm ;; + # Unless $ARCH is already set, use uname -m for all other archs: + *) export ARCH=$( uname -m ) ;; + esac +fi if [ "$ARCH" = "x86_64" ]; then LIBDIRSUFFIX="64" @@ -41,7 +52,7 @@ mkdir -p $TMP $PKG cd $TMP rm -rf gdb-$VERSION -tar xvf $CWD/gdb-$VERSION.tar.bz2 || exit 1 +tar xvf $CWD/gdb-$VERSION.tar.?z* || exit 1 cd gdb-$VERSION || exit 1 chown -R root:root . find . \ @@ -75,7 +86,7 @@ rm -f $PKG/usr/bin/gdbtui $PKG/usr/man/man1/gdbtui.1* mkdir -p $PKG/usr/doc/gdb-$VERSION/gdb cp -a COPYING* README $PKG/usr/doc/gdb-$VERSION cd gdb -cp -a NEWS README TODO $PKG/usr/doc/gdb-$VERSION/gdb +cp -a NEWS README $PKG/usr/doc/gdb-$VERSION/gdb cp -a gdbserver/README $PKG/usr/doc/gdb-$VERSION/README.gdbserver find $PKG/usr/doc/gdb-$VERSION -type f -exec chmod 644 {} \; diff --git a/source/d/git/git-1.7.1.tar.sign b/source/d/git/git-1.7.1.tar.sign new file mode 100644 index 000000000..57c6f6975 --- /dev/null +++ b/source/d/git/git-1.7.1.tar.sign @@ -0,0 +1,8 @@ +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1.4.9 (GNU/Linux) +Comment: See http://www.kernel.org/signature.html for info + +iD8DBQBL0lwtyGugalF9Dw4RAtrvAKCGeAZD3xiFceJH1b9YUEgIdo0S9QCfVoJM +Yp82hUEP7iNvKovjEKccemc= +=zw7F +-----END PGP SIGNATURE----- diff --git a/source/d/git/git.SlackBuild b/source/d/git/git.SlackBuild index bf00fcaed..7c8e9e34f 100755 --- a/source/d/git/git.SlackBuild +++ b/source/d/git/git.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2008, 2009 Patrick J. Volkerding, Sebeka, Minnesota, USA +# Copyright 2008, 2009, 2010 Patrick J. Volkerding, Sebeka, Minnesota, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -20,10 +20,22 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -VERSION=1.6.4 -ARCH=${ARCH:-x86_64} -NUMJOBS=${NUMJOBS:-" -j7 "} BUILD=${BUILD:-1} + +PKGNAM=git +VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | cut -d - -f 2 | rev | cut -f 3- -d . | rev)} +NUMJOBS=${NUMJOBS:-" -j7 "} + +# Automatically determine the architecture we're building on: +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) export ARCH=i486 ;; + arm*) export ARCH=arm ;; + # Unless $ARCH is already set, use uname -m for all other archs: + *) export ARCH=$( uname -m ) ;; + esac +fi + eval $(perl '-V:installvendorlib') PERLDIR=$installvendorlib/$ARCH-linux-thread-multi/auto @@ -42,6 +54,8 @@ elif [ "$ARCH" = "s390" ]; then SLKCFLAGS="-O2" elif [ "$ARCH" = "x86_64" ]; then SLKCFLAGS="-O2 -fPIC" +else + SLKCFLAGS="-O2" fi CWD=$(pwd) @@ -70,6 +84,7 @@ cp -a \ contrib \ $PKG/usr/doc/git-$VERSION ( cd $PKG/usr/doc/git-$VERSION/Documentation ; rm *.1 *.3 *.7 ) +( cd $PKG/usr/doc/git-$VERSION && find . -name ".git*" -exec rm -r "{}" \; ) make $NUMJOBS \ prefix=/usr \ diff --git a/source/d/guile/guile.SlackBuild b/source/d/guile/guile.SlackBuild index 79ad575d2..ec6cd977c 100755 --- a/source/d/guile/guile.SlackBuild +++ b/source/d/guile/guile.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2008, 2009 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2008, 2009, 2010 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -22,8 +22,17 @@ VERSION=1.8.7 -ARCH=${ARCH:-x86_64} -BUILD=${BUILD:-1} +BUILD=${BUILD:-3} + +# Automatically determine the architecture we're building on: +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) export ARCH=i486 ;; + arm*) export ARCH=arm ;; + # Unless $ARCH is already set, use uname -m for all other archs: + *) export ARCH=$( uname -m ) ;; + esac +fi NUMJOBS=${NUMJOBS:-" -j7 "} @@ -31,7 +40,7 @@ CWD=$(pwd) TMP=${TMP:-/tmp} PKG=$TMP/package-guile rm -rf $PKG -mkdir -p $TMP $PKG/usr +mkdir -p $PKG/usr if [ "$ARCH" = "i486" ]; then SLKCFLAGS="-O2 -march=i486 -mtune=i686" @@ -42,6 +51,9 @@ elif [ "$ARCH" = "s390" ]; then elif [ "$ARCH" = "x86_64" ]; then SLKCFLAGS="-O2 -fPIC" LIBDIRSUFFIX="64" +else + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" fi cd $TMP @@ -61,7 +73,7 @@ CFLAGS="$SLKCFLAGS" \ --infodir=/usr/info \ --mandir=/usr/man \ --with-threads \ - $ARCH-slackware-linux + --build=$ARCH-slackware-linux # Does not like parallel make... make $NUMJOBS || make || exit 1 diff --git a/source/d/intltool/intltool.SlackBuild b/source/d/intltool/intltool.SlackBuild index 5afd3e154..1588d50fa 100755 --- a/source/d/intltool/intltool.SlackBuild +++ b/source/d/intltool/intltool.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2008, 2009 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2008, 2009, 2010 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -22,16 +22,24 @@ PKGNAM=intltool -VERSION=0.40.5 -ARCH=${ARCH:-x86_64} -NUMJOBS=${NUMJOBS:-" -j7 "} +VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} BUILD=${BUILD:-1} +NUMJOBS=${NUMJOBS:-" -j7 "} + +# Automatically determine the architecture we're building on: +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) export ARCH=i486 ;; + arm*) export ARCH=arm ;; + # Unless $ARCH is already set, use uname -m for all other archs: + *) export ARCH=$( uname -m ) ;; + esac +fi + CWD=$(pwd) TMP=${TMP:-/tmp} PKG=$TMP/package-${PKGNAM} -rm -rf $PKG -mkdir -p $TMP $PKG if [ "$ARCH" = "i486" ]; then SLKCFLAGS="-O2 -march=i486 -mtune=i686" @@ -39,11 +47,15 @@ elif [ "$ARCH" = "s390" ]; then SLKCFLAGS="-O2" elif [ "$ARCH" = "x86_64" ]; then SLKCFLAGS="-O2 -fPIC" +else + SLKCFLAGS="-O2" fi +rm -rf $PKG +mkdir -p $TMP $PKG cd $TMP rm -rf ${PKGNAM}-${VERSION} -tar xvf $CWD/${PKGNAM}-$VERSION.tar.bz2 || exit 1 +tar xvf $CWD/${PKGNAM}-$VERSION.tar.?z* || exit 1 cd ${PKGNAM}-$VERSION # Make sure ownerships and permissions are sane: @@ -99,6 +111,14 @@ cp -a \ AUTHORS COPYING* INSTALL NEWS README* TODO \ $PKG/usr/doc/${PKGNAM}-$VERSION +# If there's a ChangeLog, installing at least part of the recent history +# is useful, but don't let it get totally out of control: +if [ -r ChangeLog ]; then + DOCSDIR=$(echo $PKG/usr/doc/${PKGNAM}-$VERSION) + cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog + touch -r ChangeLog $DOCSDIR/ChangeLog +fi + mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc diff --git a/source/d/libtool/libtool.SlackBuild b/source/d/libtool/libtool.SlackBuild index fb833a720..75a0ff2c1 100755 --- a/source/d/libtool/libtool.SlackBuild +++ b/source/d/libtool/libtool.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2008, 2009 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2008, 2010 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -9,7 +9,7 @@ # 1. Redistributions of this script must retain the above copyright # notice, this list of conditions and the following disclaimer. # -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED # WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF # MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO # EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, @@ -20,11 +20,20 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +VERSION=${VERSION:-$(echo libtool-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} +BUILD=${BUILD:-2} -VERSION=1.5.26 -ARCH=${ARCH:-x86_64} -NUMJOBS=${NUMJOBS:-" -j7 "} -BUILD=${BUILD:-1} +NUMJOBS=${NUMJOBS:--j6} + +# Automatically determine the architecture we're building on: +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) export ARCH=i486 ;; + arm*) export ARCH=arm ;; + # Unless $ARCH is already set, use uname -m for all other archs: + *) export ARCH=$( uname -m ) ;; + esac +fi CWD=$(pwd) TMP=${TMP:-/tmp} @@ -36,20 +45,21 @@ if [ "$ARCH" = "i486" ]; then elif [ "$ARCH" = "i686" ]; then SLKCFLAGS="-O2 -march=i686 -mtune=i686" LIBDIRSUFFIX="" -elif [ "$ARCH" = "s390" ]; then - SLKCFLAGS="-O2" - LIBDIRSUFFIX="" elif [ "$ARCH" = "x86_64" ]; then SLKCFLAGS="-O2 -fPIC" LIBDIRSUFFIX="64" +else + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" fi rm -rf $PKG mkdir -p $TMP $PKG - cd $TMP rm -rf libtool-$VERSION + tar xvf $CWD/libtool-$VERSION.tar.?z* || exit 1 + cd libtool-$VERSION chown -R root:root . find . \ @@ -60,7 +70,6 @@ find . \ zcat $CWD/libtool.no.moved.warning.diff.gz | patch -p1 --verbose || exit 1 - CFLAGS="$SLKCFLAGS" \ ./configure \ --prefix=/usr \ @@ -70,7 +79,7 @@ CFLAGS="$SLKCFLAGS" \ --build=$ARCH-slackware-linux make $NUMJOBS || make || exit 1 -make install DESTDIR=$PKG || exit 1 +make install DESTDIR=$PKG find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null @@ -81,12 +90,12 @@ gzip -9 $PKG/usr/info/* mkdir -p $PKG/usr/doc/libtool-$VERSION cp -a \ AUTHORS COPYING NEWS README THANKS TODO \ - $PKG/usr/doc/libtool-$VERSION + $PKG/usr/doc/libtool-$VERSION mkdir $PKG/install zcat $CWD/doinst.sh.gz > $PKG/install/doinst.sh cat $CWD/slack-desc > $PKG/install/slack-desc cd $PKG -/sbin/makepkg -l y -c n $TMP/libtool-$VERSION-$ARCH-$BUILD.txz +/sbin/makepkg -l y -c n $TMP/libtool-${VERSION}-$ARCH-$BUILD.txz diff --git a/source/d/libtool/libtool.no.moved.warning.diff b/source/d/libtool/libtool.no.moved.warning.diff index e5197b5c6..f6a82285a 100644 --- a/source/d/libtool/libtool.no.moved.warning.diff +++ b/source/d/libtool/libtool.no.moved.warning.diff @@ -1,32 +1,44 @@ -diff -Nur libtool-1.5.26.orig/libltdl/ltmain.sh libtool-1.5.26/libltdl/ltmain.sh ---- libtool-1.5.26.orig/libltdl/ltmain.sh 2008-02-01 10:39:51.000000000 -0600 -+++ libtool-1.5.26/libltdl/ltmain.sh 2008-10-01 13:59:24.654020673 -0500 -@@ -2952,9 +2952,9 @@ - $echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2 - exit $EXIT_FAILURE - fi -- if test "$absdir" != "$libdir"; then -- $echo "$modename: warning: \`$deplib' seems to be moved" 1>&2 -- fi -+ #if test "$absdir" != "$libdir"; then -+ # $echo "$modename: warning: \`$deplib' seems to be moved" 1>&2 -+ #fi - path="$absdir" +--- ./libltdl/config/ltmain.m4sh.orig 2009-11-16 07:17:22.000000000 -0600 ++++ ./libltdl/config/ltmain.m4sh 2010-02-06 18:13:00.000000000 -0600 +@@ -4965,7 +4965,7 @@ + # Find the relevant object directory and library name. + if test "X$installed" = Xyes; then + if test ! -f "$libdir/$linklib" && test -f "$abs_ladir/$linklib"; then +- func_warning "library \`$lib' was moved." ++ # func_warning "library \`$lib' was moved." + dir="$ladir" + absdir="$abs_ladir" + libdir="$abs_ladir" +@@ -5496,8 +5496,8 @@ + eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib` + test -z "$libdir" && \ + func_fatal_error "\`$deplib' is not a valid libtool archive" +- test "$absdir" != "$libdir" && \ +- func_warning "\`$deplib' seems to be moved" ++ # test "$absdir" != "$libdir" && \ ++ # func_warning "\`$deplib' seems to be moved" + + path="-L$absdir" fi - depdepl= -diff -Nur libtool-1.5.26.orig/ltmain.sh libtool-1.5.26/ltmain.sh ---- libtool-1.5.26.orig/ltmain.sh 2008-02-01 10:39:51.000000000 -0600 -+++ libtool-1.5.26/ltmain.sh 2008-10-01 13:59:24.690024584 -0500 -@@ -2952,9 +2952,9 @@ - $echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2 - exit $EXIT_FAILURE - fi -- if test "$absdir" != "$libdir"; then -- $echo "$modename: warning: \`$deplib' seems to be moved" 1>&2 -- fi -+ #if test "$absdir" != "$libdir"; then -+ # $echo "$modename: warning: \`$deplib' seems to be moved" 1>&2 -+ #fi - path="$absdir" +--- ./libltdl/config/ltmain.sh.orig 2009-11-16 07:23:18.000000000 -0600 ++++ ./libltdl/config/ltmain.sh 2010-02-06 18:13:26.000000000 -0600 +@@ -5407,7 +5407,7 @@ + # Find the relevant object directory and library name. + if test "X$installed" = Xyes; then + if test ! -f "$libdir/$linklib" && test -f "$abs_ladir/$linklib"; then +- func_warning "library \`$lib' was moved." ++ # func_warning "library \`$lib' was moved." + dir="$ladir" + absdir="$abs_ladir" + libdir="$abs_ladir" +@@ -5938,8 +5938,8 @@ + eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib` + test -z "$libdir" && \ + func_fatal_error "\`$deplib' is not a valid libtool archive" +- test "$absdir" != "$libdir" && \ +- func_warning "\`$deplib' seems to be moved" ++ # test "$absdir" != "$libdir" && \ ++ # func_warning "\`$deplib' seems to be moved" + + path="-L$absdir" fi - depdepl= diff --git a/source/d/m4/m4.SlackBuild b/source/d/m4/m4.SlackBuild index 06c73757e..f74e022fd 100755 --- a/source/d/m4/m4.SlackBuild +++ b/source/d/m4/m4.SlackBuild @@ -20,11 +20,21 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -VERSION=1.4.13 -ARCH=${ARCH:-x86_64} -NUMJOBS=${NUMJOBS:-" -j7 "} +VERSION=1.4.14 BUILD=${BUILD:-1} +NUMJOBS=${NUMJOBS:-" -j7 "} + +# Automatically determine the architecture we're building on: +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) export ARCH=i486 ;; + arm*) export ARCH=arm ;; + # Unless $ARCH is already set, use uname -m for all other archs: + *) export ARCH=$( uname -m ) ;; + esac +fi + CWD=$(pwd) TMP=${TMP:-/tmp} PKG=$TMP/package-m4 @@ -38,6 +48,9 @@ elif [ "$ARCH" = "s390" ]; then elif [ "$ARCH" = "x86_64" ]; then SLKCFLAGS="-O2 -fPIC" LIBDIRSUFFIX="64" +else + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" fi rm -rf $PKG @@ -97,12 +110,8 @@ fi #cat src/m4 > $PKG/usr/bin/m4 #chmod 755 $PKG/usr/bin/* -( cd $PKG - find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | \ - xargs strip --strip-unneeded 2> /dev/null || true - find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | \ - xargs strip --strip-unneeded 2> /dev/null -) +find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ + | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null mkdir -p $PKG/usr/doc/m4-$VERSION cp -a \ @@ -110,7 +119,7 @@ cp -a \ $PKG/usr/doc/m4-$VERSION head -n 357 ChangeLog > $PKG/usr/doc/m4-$VERSION/ChangeLog touch -r ChangeLog $PKG/usr/doc/m4-$VERSION/ChangeLog -chmod 644 $PKG/usr/doc/m4-$VERSION/COPYING* +chmod 0644 $PKG/usr/doc/m4-$VERSION/COPYING* mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc diff --git a/source/d/perl/doinst.sh b/source/d/mercurial/doinst.sh index 8d2debb06..4cefcc343 100644 --- a/source/d/perl/doinst.sh +++ b/source/d/mercurial/doinst.sh @@ -1,4 +1,3 @@ -#!/bin/sh config() { NEW="$1" OLD="`dirname $NEW`/`basename $NEW .new`" @@ -10,4 +9,5 @@ config() { fi # Otherwise, we leave the .new copy for the admin to consider... } -config usr/lib/perl5/5.10.0/i486-linux-thread-multi/perllocal.pod.new +config etc/mercurial/hgrc.d/hgk.rc.new +rm -f etc/mercurial/hgrc.d/hgk.rc.new diff --git a/source/d/mercurial/mercurial.SlackBuild b/source/d/mercurial/mercurial.SlackBuild index 88ccc969f..0069eac2b 100755 --- a/source/d/mercurial/mercurial.SlackBuild +++ b/source/d/mercurial/mercurial.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2008, 2009 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2008, 2009, 2010 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -20,10 +20,19 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -VERSION=1.2.1 -ARCH=${ARCH:-x86_64} +VERSION=${VERSION:-$(echo mercurial-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} BUILD=${BUILD-1} +# Automatically determine the architecture we're building on: +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) export ARCH=i486 ;; + arm*) export ARCH=arm ;; + # Unless $ARCH is already set, use uname -m for all other archs: + *) export ARCH=$( uname -m ) ;; + esac +fi + CWD=$(pwd) TMP=${TMP:-/tmp} PKG=$TMP/package-mercurial @@ -33,7 +42,7 @@ mkdir -p $TMP $PKG cd $TMP rm -rf mercurial-$VERSION -tar xvf $CWD/mercurial-$VERSION.tar.bz2 || exit 1 +tar xvf $CWD/mercurial-$VERSION.tar.?z* || exit 1 cd mercurial-$VERSION chown -R root.root . find . \ @@ -44,6 +53,36 @@ find . \ python setup.py build install --root=$PKG || exit 1 +# Ordinarily we will not add stuff that's not installed through the normal +# default installation method, but we've had a lot of requests, and it appears +# that installing at least the hgk extension is the ad-hoc standard. +mkdir -p $PKG/usr/libexec/mercurial +cp -a contrib/hgk $PKG/usr/libexec/mercurial +chmod 0755 $PKG/usr/libexec/mercurial/hgk + +mkdir -p $PKG/etc/mercurial/hgrc.d +cat << EOF > $PKG/etc/mercurial/hgrc.d/hgk.rc.new +[extensions] +# enable hgk extension ('hg help' shows 'view' as a command) +hgk = +[hgk] + +path=/usr/libexec/mercurial/hgk +EOF + +# Bash and zsh completion: +mkdir -p $PKG/etc/bash_completion.d +cp -a contrib/bash_completion $PKG/etc/bash_completion.d/mercurial.sh +chmod 644 $PKG/etc/bash_completion.d/mercurial.sh +mkdir -p $PKG/usr/share/zsh/site-functions +cp -a contrib/zsh_completion $PKG/usr/share/zsh/site-functions/_mercurial +chmod 644 $PKG/usr/share/zsh/site-functions/_mercurial + +# Emacs Lisp extensions: +mkdir -p $PKG/usr/share/emacs/site-lisp +cp -a contrib/mercurial.el contrib/mq.el $PKG/usr/share/emacs/site-lisp +chmod 644 $PKG/usr/share/emacs/site-lisp/* + find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null @@ -62,6 +101,7 @@ cp -a \ $PKG/usr/doc/mercurial-$VERSION mkdir -p $PKG/install +zcat $CWD/doinst.sh.gz > $PKG/install/doinst.sh cat $CWD/slack-desc > $PKG/install/slack-desc cd $PKG diff --git a/source/d/nasm/nasm.SlackBuild b/source/d/nasm/nasm.SlackBuild index 27cbc57cd..73e1e37a8 100755 --- a/source/d/nasm/nasm.SlackBuild +++ b/source/d/nasm/nasm.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2008, 2009 Patrick J. Volkerding, Sebeka, Minnesota, USA +# Copyright 2008, 2009, 2010 Patrick J. Volkerding, Sebeka, Minnesota, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -21,10 +21,19 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -VERSION=2.05.01 -ARCH=${ARCH:-x86_64} +VERSION=2.07 BUILD=${BUILD:-1} +# Automatically determine the architecture we're building on: +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) export ARCH=i486 ;; + arm*) export ARCH=arm ;; + # Unless $ARCH is already set, use uname -m for all other archs: + *) export ARCH=$( uname -m ) ;; + esac +fi + if [ "$ARCH" = "x86_64" ]; then SLKCFLAGS="-O2 -fPIC" else diff --git a/source/d/oprofile/oprofile.SlackBuild b/source/d/oprofile/oprofile.SlackBuild index 28feae4ab..8a9d2bef5 100755 --- a/source/d/oprofile/oprofile.SlackBuild +++ b/source/d/oprofile/oprofile.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2005-2009 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2005-2010 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -21,12 +21,21 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -VERSION=0.9.4 -ARCH=${ARCH:-x86_64} +VERSION=${VERSION:-$(echo oprofile-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} BUILD=${BUILD:-2} NUMJOBS=${NUMJOBS:-" -j7 "} +# Automatically determine the architecture we're building on: +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) export ARCH=i486 ;; + arm*) export ARCH=arm ;; + # Unless $ARCH is already set, use uname -m for all other archs: + *) export ARCH=$( uname -m ) ;; + esac +fi + if [ "$ARCH" = "i486" ]; then SLKCFLAGS="-O2 -march=i486 -mtune=i686" LIBDIRSUFFIX="" @@ -52,8 +61,13 @@ rm -rf $PKG mkdir -p $TMP $PKG cd $TMP || exit 1 rm -rf oprofile-$VERSION -tar xvf $CWD/oprofile-$VERSION.tar.bz2 || exit 1 +tar xvf $CWD/oprofile-$VERSION.tar.?z* || exit 1 cd oprofile-$VERSION + +zcat $CWD/oprofile.qt4.diff.gz | patch -p1 --verbose || exit 1 + +./autogen.sh + chown -R root:root . find . \ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ @@ -72,21 +86,46 @@ CXXFLAGS="$SLKCFLAGS" \ make $NUMJOBS || make || exit 1 make install DESTDIR=$PKG +# Strip binaries: +( cd $PKG + find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null + find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null +) + +# Compress and link manpages, if any: +if [ -d $PKG/usr/man ]; then + ( cd $PKG/usr/man + for manpagedir in $(find . -type d -name "man*") ; do + ( cd $manpagedir + for eachpage in $( find . -type l -maxdepth 1) ; do + ln -s $( readlink $eachpage ).gz $eachpage.gz + rm $eachpage + done + gzip -9 *.? + ) + done + ) +fi + # This seems misplaced, and isn't referenced by any binaries or other files. # I'm tempted to think it shouldn't have been installed, but will just move it: if [ -r $PKG/usr/share/mangled-name ]; then mv $PKG/usr/share/mangled-name $PKG/usr/share/oprofile/mangled-name fi -( cd $PKG/usr/bin - strip --strip-unneeded * -) + mv $PKG/usr/share/doc $PKG/usr mv $PKG/usr/doc/oprofile $PKG/usr/doc/oprofile-$VERSION cp -a \ COPYING README TODO \ $PKG/usr/doc/oprofile-$VERSION -gzip -9 $PKG/usr/man/man?/* +# If there's a ChangeLog, installing at least part of the recent history +# is useful, but don't let it get totally out of control: +if [ -r ChangeLog ]; then + DOCSDIR=$(echo $PKG/usr/doc/*-$VERSION) + cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog + touch -r ChangeLog $DOCSDIR/ChangeLog +fi mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc diff --git a/source/d/oprofile/oprofile.qt4.diff b/source/d/oprofile/oprofile.qt4.diff new file mode 100644 index 000000000..e5506a82e --- /dev/null +++ b/source/d/oprofile/oprofile.qt4.diff @@ -0,0 +1,3194 @@ +commit 4513fe62e4517057374091092073e0940584ebe2 +Author: Tobias Doerffel <tobias.doerffel@gmail.com> +Date: Mon Jun 29 12:05:49 2009 +0200 + + Port GUI to Qt4 + +diff --git a/configure.in b/configure.in +index 6f684a0..883a7ad 100644 +--- a/configure.in ++++ b/configure.in +@@ -131,7 +131,7 @@ ORIG_X_SAVE_LIBS="$LIBS" + LIBS="$X_PRE_LIBS $LIBS $X_LIBS -lX11 $X_EXTRA_LIBS" + X_LIBS="$LIBS" + AC_SUBST(X_LIBS) +-QT_DO_IT_ALL ++QT4_DO_IT_ALL + LIBS="$ORIG_X_SAVE_LIBS" + + dnl enable pch for c++ +@@ -155,7 +155,7 @@ AC_SUBST(POPT_LIBS) + + # do NOT put tests here, they will fail in the case X is not installed ! + +-AM_CONDITIONAL(have_qt, test -n "$QT_LIB") ++AM_CONDITIONAL(have_qt, test -n "$QT4_LIB") + + AX_CFLAGS_OPTION(OP_CFLAGS,[-W]) + AX_CXXFLAGS_OPTION(OP_CXXFLAGS,[-W]) +@@ -258,7 +258,6 @@ AC_OUTPUT(Makefile \ + opjitconv/Makefile \ + pp/Makefile \ + gui/Makefile \ +- gui/ui/Makefile \ + module/Makefile \ + module/x86/Makefile \ + module/ia64/Makefile \ +@@ -268,8 +267,8 @@ AC_OUTPUT(Makefile \ + + AX_COPY_IF_CHANGE(doc/xsl/catalog-1.xml, doc/xsl/catalog.xml) + +-if test -z "$QT_LIB"; then +- echo "Warning: a working Qt not found; no GUI will be built" ++if test -z "$QT4_LIB"; then ++ echo "Warning: a working Qt4 not found; no GUI will be built" + fi + + if test "`getent passwd oprofile 2>/dev/null`" == "" || \ +diff --git a/gui/Makefile.am b/gui/Makefile.am +index ba5e27c..69e01dd 100644 +--- a/gui/Makefile.am ++++ b/gui/Makefile.am +@@ -1,5 +1,3 @@ +-SUBDIRS = ui +- + dist_sources = \ + oprof_start.cpp \ + oprof_start_config.cpp \ +@@ -14,7 +12,7 @@ EXTRA_DIST = $(dist_sources) + if have_qt + + AM_CPPFLAGS = \ +- @QT_INCLUDES@ \ ++ @QT4_INCLUDES@ \ + -I ${top_srcdir}/libop \ + -I ${top_srcdir}/libutil++ \ + -I ${top_srcdir}/libutil +@@ -25,19 +23,22 @@ bin_PROGRAMS = oprof_start + + oprof_start_SOURCES = $(dist_sources) + nodist_oprof_start_SOURCES = oprof_start.moc.cpp ++BUILT_SOURCES = ui_oprof_start.base.h + oprof_start_LDADD = \ + ../libutil++/libutil++.a \ + ../libop/libop.a \ + ../libutil/libutil.a \ +- ui/liboprof_start.a \ +- @QT_LDFLAGS@ \ +- @QT_LIB@ \ ++ @QT4_LDFLAGS@ \ ++ @QT4_LIB@ -lQt3Support \ + @X_LIBS@ + + oprof_start.moc.cpp: ${top_srcdir}/gui/oprof_start.h +- $(MOC) -o $@ ${top_srcdir}/gui/oprof_start.h ++ $(MOC4) -o $@ ${top_srcdir}/gui/oprof_start.h ++ ++ui_oprof_start.base.h: ${top_srcdir}/gui/ui/oprof_start.base.ui ++ $(UIC4) -o $@ $< + + clean-local: +- rm -f oprof_start.moc.cpp ++ rm -f oprof_start.moc.cpp ui_oprof_start.base.h + + endif +diff --git a/gui/oprof_start.cpp b/gui/oprof_start.cpp +index 0387136..615c8d7 100644 +--- a/gui/oprof_start.cpp ++++ b/gui/oprof_start.cpp +@@ -23,7 +23,6 @@ + #include <qlineedit.h> + #include <qlistview.h> + #include <qcombobox.h> +-#include <qlistbox.h> + #include <qfiledialog.h> + #include <qbuttongroup.h> + #include <qcheckbox.h> +@@ -32,7 +31,8 @@ + #include <qvalidator.h> + #include <qlabel.h> + #include <qpushbutton.h> +-#include <qheader.h> ++#include <Qt3Support/Q3ListBox> ++#include <Qt3Support/Q3Header> + + #include "config.h" + #include "oprof_start.h" +@@ -106,12 +106,15 @@ op_event_descr::op_event_descr() + + oprof_start::oprof_start() + : +- oprof_start_base(0, 0, false, 0), ++ QDialog(0), ++ oprof_start_base(), + event_count_validator(new QIntValidator(event_count_edit)), + current_event(0), + cpu_speed(op_cpu_frequency()), + total_nr_interrupts(0) + { ++ setupUi( this ); ++ + green_pixmap = new QPixmap(green_xpm); + red_pixmap = new QPixmap(red_xpm); + vector<string> args; +@@ -124,7 +127,7 @@ oprof_start::oprof_start() + op_nr_counters = op_get_nr_counters(cpu_type); + + if (cpu_type == CPU_TIMER_INT) { +- setup_config_tab->removePage(counter_setup_page); ++ setup_config_tab->removeTab(setup_config_tab->indexOf(counter_setup_page)); + } else { + fill_events(); + } +@@ -268,12 +271,12 @@ void oprof_start::fill_events() + namespace { + + /// find the first item with the given text in column 0 or return NULL +-QListViewItem * findItem(QListView * view, char const * name) ++Q3ListViewItem * findItem(Q3ListView * view, char const * name) + { +- // Qt 2.3.1 does not have QListView::findItem() +- QListViewItem * item = view->firstChild(); ++ // Qt 2.3.1 does not have Q3ListView::findItem() ++ Q3ListViewItem * item = view->firstChild(); + +- while (item && strcmp(item->text(0).latin1(), name)) ++ while (item && strcmp(item->text(0).toLatin1().constData(), name)) + item = item->nextSibling(); + + return item; +@@ -292,7 +295,7 @@ void oprof_start::setup_default_event() + event_cfgs[descr.name].user_ring_count = 1; + event_cfgs[descr.name].os_ring_count = 1; + +- QListViewItem * item = findItem(events_list, descr.name); ++ Q3ListViewItem * item = findItem(events_list, descr.name); + if (item) + item->setSelected(true); + } +@@ -349,7 +352,7 @@ void oprof_start::read_set_events() + event_cfgs[ev_name].os_ring_count = 1; + } + +- QListViewItem * item = findItem(events_list, ev_name.c_str()); ++ Q3ListViewItem * item = findItem(events_list, ev_name.c_str()); + if (item) + item->setSelected(true); + } +@@ -436,7 +439,7 @@ void oprof_start::fill_events_listbox() + + for (vector<op_event_descr>::reverse_iterator cit = v_events.rbegin(); + cit != v_events.rend(); ++cit) { +- new QListViewItem(events_list, cit->name.c_str()); ++ new Q3ListViewItem(events_list, cit->name.c_str()); + } + + setUpdatesEnabled(true); +@@ -467,7 +470,7 @@ void oprof_start::display_event(op_event_descr const & descr) + } + + +-bool oprof_start::is_selectable_event(QListViewItem * item) ++bool oprof_start::is_selectable_event(Q3ListViewItem * item) + { + if (item->isSelected()) + return true; +@@ -486,7 +489,7 @@ bool oprof_start::is_selectable_event(QListViewItem * item) + + void oprof_start::draw_event_list() + { +- QListViewItem * cur; ++ Q3ListViewItem * cur; + for (cur = events_list->firstChild(); cur; cur = cur->nextSibling()) { + if (is_selectable_event(cur)) + cur->setPixmap(0, *green_pixmap); +@@ -500,9 +503,9 @@ bool oprof_start::alloc_selected_events() const + { + vector<op_event const *> events; + +- set<QListViewItem *>::const_iterator it; ++ set<Q3ListViewItem *>::const_iterator it; + for (it = selected_events.begin(); it != selected_events.end(); ++it) +- events.push_back(find_event_by_name((*it)->text(0).latin1(),0,0)); ++ events.push_back(find_event_by_name((*it)->text(0).toLatin1().constData(),0,0)); + + size_t * map = + map_event_to_counter(&events[0], events.size(), cpu_type); +@@ -520,24 +523,24 @@ void oprof_start::event_selected() + // (de)selected item so we record a set of selected items and diff + // it in the appropriate way with the previous list of selected items. + +- set<QListViewItem *> current_selection; +- QListViewItem * cur; ++ set<Q3ListViewItem *> current_selection; ++ Q3ListViewItem * cur; + for (cur = events_list->firstChild(); cur; cur = cur->nextSibling()) { + if (cur->isSelected()) + current_selection.insert(cur); + } + + // First remove the deselected item. +- vector<QListViewItem *> new_deselected; ++ vector<Q3ListViewItem *> new_deselected; + set_difference(selected_events.begin(), selected_events.end(), + current_selection.begin(), current_selection.end(), + back_inserter(new_deselected)); +- vector<QListViewItem *>::const_iterator it; ++ vector<Q3ListViewItem *>::const_iterator it; + for (it = new_deselected.begin(); it != new_deselected.end(); ++it) + selected_events.erase(*it); + + // Now try to add the newly selected item if enough HW resource exists +- vector<QListViewItem *> new_selected; ++ vector<Q3ListViewItem *> new_selected; + set_difference(current_selection.begin(), current_selection.end(), + selected_events.begin(), selected_events.end(), + back_inserter(new_selected)); +@@ -554,26 +557,26 @@ void oprof_start::event_selected() + draw_event_list(); + + if (current_event) +- display_event(locate_event(current_event->text(0).latin1())); ++ display_event(locate_event(current_event->text(0).toLatin1().constData())); + } + + +-void oprof_start::event_over(QListViewItem * item) ++void oprof_start::event_over(Q3ListViewItem * item) + { +- op_event_descr const & descr = locate_event(item->text(0).latin1()); ++ op_event_descr const & descr = locate_event(item->text(0).toLatin1().constData()); + + string help_str = descr.help_str.c_str(); + if (!is_selectable_event(item)) { + help_str += " conflicts with:"; + +- set<QListViewItem *>::const_iterator it; ++ set<Q3ListViewItem *>::const_iterator it; + for (it = selected_events.begin(); + it != selected_events.end(); ) { +- QListViewItem * temp = *it; ++ Q3ListViewItem * temp = *it; + selected_events.erase(it++); + if (is_selectable_event(item)) { + help_str += " "; +- help_str += temp->text(0).latin1(); ++ help_str += temp->text(0).toLatin1().constData(); + } + selected_events.insert(temp); + } +@@ -586,7 +589,7 @@ void oprof_start::event_over(QListViewItem * item) + /// select the kernel image filename + void oprof_start::choose_kernel_filename() + { +- string name = kernel_filename_edit->text().latin1(); ++ string name = kernel_filename_edit->text().toLatin1().constData(); + string result = do_open_file_or_dir(name, false); + + if (!result.empty()) +@@ -601,7 +604,7 @@ void oprof_start::record_selected_event_config() + if (!current_event) + return; + +- string name(current_event->text(0).latin1()); ++ string name(current_event->text(0).toLatin1().constData()); + + event_setting & cfg = event_cfgs[name]; + op_event_descr const & curr = locate_event(name); +@@ -617,7 +620,7 @@ void oprof_start::record_selected_event_config() + // are not sufficient to do the validation) + bool oprof_start::record_config() + { +- config.kernel_filename = kernel_filename_edit->text().latin1(); ++ config.kernel_filename = kernel_filename_edit->text().toLatin1().constData(); + config.no_kernel = no_vmlinux->isChecked(); + + uint temp = buffer_size_edit->text().toUInt(); +@@ -824,7 +827,7 @@ uint oprof_start::max_perf_count() const + } + + +-void oprof_start::on_flush_profiler_data() ++void oprof_start::flush_profiler_data() + { + vector<string> args; + args.push_back("--dump"); +@@ -837,14 +840,14 @@ void oprof_start::on_flush_profiler_data() + + + // user is happy of its setting. +-void oprof_start::on_start_profiler() ++void oprof_start::start_profiler() + { + // save the current settings + record_selected_event_config(); + + bool one_enable = false; + +- QListViewItem * cur; ++ Q3ListViewItem * cur; + for (cur = events_list->firstChild(); cur; cur = cur->nextSibling()) { + if (!cur->isSelected()) + continue; +@@ -852,9 +855,9 @@ void oprof_start::on_start_profiler() + // the missing reference is intended: gcc 2.91.66 can compile + // "op_event_descr const & descr = ..." w/o a warning + op_event_descr const descr = +- locate_event(cur->text(0).latin1()); ++ locate_event(cur->text(0).toLatin1().constData()); + +- event_setting & cfg = event_cfgs[cur->text(0).latin1()]; ++ event_setting & cfg = event_cfgs[cur->text(0).toLatin1().constData()]; + + one_enable = true; + +@@ -909,7 +912,7 @@ void oprof_start::on_start_profiler() + return; + + // this flush profiler data also. +- on_stop_profiler(); ++ stop_profiler(); + } + + vector<string> args; +@@ -946,15 +949,15 @@ bool oprof_start::save_config() + vector<string> tmpargs; + tmpargs.push_back("--setup"); + +- QListViewItem * cur; ++ Q3ListViewItem * cur; + for (cur = events_list->firstChild(); cur; cur = cur->nextSibling()) { + if (!cur->isSelected()) + continue; + +- event_setting & cfg = event_cfgs[cur->text(0).latin1()]; ++ event_setting & cfg = event_cfgs[cur->text(0).toLatin1().constData()]; + + op_event_descr const & descr = +- locate_event(cur->text(0).latin1()); ++ locate_event(cur->text(0).toLatin1().constData()); + + one_enabled = true; + +@@ -1016,7 +1019,7 @@ bool oprof_start::save_config() + + + // flush and stop the profiler if it was started. +-void oprof_start::on_stop_profiler() ++void oprof_start::stop_profiler() + { + vector<string> args; + args.push_back("--shutdown"); +@@ -1030,13 +1033,13 @@ void oprof_start::on_stop_profiler() + } + + +-void oprof_start::on_separate_kernel_cb_changed(int state) ++void oprof_start::separate_kernel_cb_changed(int state) + { + if (state == 2) + separate_lib_cb->setChecked(true); + } + +-void oprof_start::on_reset_sample_files() ++void oprof_start::reset_sample_files() + { + int ret = QMessageBox::warning(this, 0, "Are you sure you want to " + "reset your last profile session ?", "Yes", "No", 0, 0, 1); +diff --git a/gui/oprof_start.h b/gui/oprof_start.h +index c2910ee..a2c5eb5 100644 +--- a/gui/oprof_start.h ++++ b/gui/oprof_start.h +@@ -16,13 +16,16 @@ + #include <map> + #include <set> + +-#include "ui/oprof_start.base.h" ++#include <QtGui/QDialog> ++class QColorGroup; ++ ++#include "ui_oprof_start.base.h" + #include "oprof_start_config.h" + + #include "op_events.h" + + class QIntValidator; +-class QListViewItem; ++class Q3ListViewItem; + class QTimerEvent; + + /// a struct describing a particular event type +@@ -43,7 +46,7 @@ struct op_event_descr { + uint min_count; + }; + +-class oprof_start : public oprof_start_base ++class oprof_start : public QDialog, public Ui::oprof_start_base + { + Q_OBJECT + +@@ -54,19 +57,19 @@ protected slots: + /// select the kernel image filename + void choose_kernel_filename(); + /// flush profiler +- void on_flush_profiler_data(); ++ void flush_profiler_data(); + /// start profiler +- void on_start_profiler(); ++ void start_profiler(); + /// stop profiler +- void on_stop_profiler(); ++ void stop_profiler(); + /// events selection change + void event_selected(); + /// the mouse is over an event +- void event_over(QListViewItem *); ++ void event_over(Q3ListViewItem *); + /// state of separate_kernel_cb changed +- void on_separate_kernel_cb_changed(int); ++ void separate_kernel_cb_changed(int); + /// reset sample files +- void on_reset_sample_files(); ++ void reset_sample_files(); + + /// close the dialog + void accept(); +@@ -121,7 +124,7 @@ private: + void draw_event_list(); + + /// return true if item is selectable or already selected +- bool is_selectable_event(QListViewItem * item); ++ bool is_selectable_event(Q3ListViewItem * item); + + /// try to alloc counters for the selected_events + bool alloc_selected_events() const; +@@ -139,8 +142,8 @@ private: + /// The currently selected events. We must track this because + /// with multiple selection listbox QT doesn't allow to know + /// what is the last selected item. events_selected() update it +- std::set<QListViewItem *> selected_events; +- QListViewItem * current_event; ++ std::set<Q3ListViewItem *> selected_events; ++ Q3ListViewItem * current_event; + + /// current config + config_setting config; +diff --git a/gui/oprof_start_main.cpp b/gui/oprof_start_main.cpp +index 44da5de..4930d9a 100644 +--- a/gui/oprof_start_main.cpp ++++ b/gui/oprof_start_main.cpp +@@ -19,7 +19,7 @@ int main(int argc, char* argv[]) + + oprof_start* dlg = new oprof_start(); + +- a.setMainWidget(dlg); ++ a.setActiveWindow(dlg); + + dlg->show(); + +diff --git a/gui/oprof_start_util.cpp b/gui/oprof_start_util.cpp +index d293431..17359ae 100644 +--- a/gui/oprof_start_util.cpp ++++ b/gui/oprof_start_util.cpp +@@ -293,17 +293,16 @@ string const do_open_file_or_dir(string const & base_dir, bool dir_only) + QString result; + + if (dir_only) { +- result = QFileDialog::getExistingDirectory(base_dir.c_str(), 0, +- "open_file_or_dir", "Get directory name", true); ++ result = QFileDialog::getExistingDirectory(NULL, "Get directory name", ++ base_dir.c_str(), QFileDialog::ShowDirsOnly); + } else { +- result = QFileDialog::getOpenFileName(base_dir.c_str(), 0, 0, +- "open_file_or_dir", "Get filename"); ++ result = QFileDialog::getOpenFileName(NULL, "Get filename", base_dir.c_str()); + } + + if (result.isNull()) + return string(); + else +- return result.latin1(); ++ return result.toLatin1().constData(); + } + + /** +diff --git a/gui/ui/oprof_start.base.ui b/gui/ui/oprof_start.base.ui +index 4fcc43f..b882656 100644 +--- a/gui/ui/oprof_start.base.ui ++++ b/gui/ui/oprof_start.base.ui +@@ -1,1190 +1,1055 @@ +-<!DOCTYPE UI><UI> +-<class>oprof_start_base</class> +-<widget> +- <class>QDialog</class> +- <property stdset="1"> +- <name>name</name> +- <cstring>oprof_start_base</cstring> +- </property> +- <property stdset="1"> +- <name>geometry</name> +- <rect> +- <x>0</x> +- <y>0</y> +- <width>625</width> +- <height>735</height> +- </rect> +- </property> +- <property stdset="1"> +- <name>caption</name> +- <string>Start profiler</string> +- </property> +- <property stdset="1"> +- <name>sizeGripEnabled</name> +- <bool>true</bool> +- </property> +- <vbox> +- <property stdset="1"> +- <name>margin</name> +- <number>11</number> +- </property> +- <property stdset="1"> +- <name>spacing</name> +- <number>6</number> +- </property> +- <widget> +- <class>QTabWidget</class> +- <property stdset="1"> +- <name>name</name> +- <cstring>setup_config_tab</cstring> ++<?xml version="1.0" encoding="UTF-8"?> ++<ui version="4.0"> ++ <class>oprof_start_base</class> ++ <widget class="QDialog" name="oprof_start_base"> ++ <property name="geometry"> ++ <rect> ++ <x>0</x> ++ <y>0</y> ++ <width>625</width> ++ <height>735</height> ++ </rect> ++ </property> ++ <property name="windowTitle"> ++ <string>Start profiler</string> ++ </property> ++ <property name="sizeGripEnabled"> ++ <bool>true</bool> ++ </property> ++ <layout class="QVBoxLayout"> ++ <property name="spacing"> ++ <number>6</number> ++ </property> ++ <property name="margin"> ++ <number>11</number> ++ </property> ++ <item> ++ <widget class="QTabWidget" name="setup_config_tab"> ++ <widget class="QWidget" name="counter_setup_page"> ++ <attribute name="title"> ++ <string>&Setup</string> ++ </attribute> ++ <layout class="QVBoxLayout"> ++ <property name="spacing"> ++ <number>6</number> ++ </property> ++ <property name="margin"> ++ <number>11</number> ++ </property> ++ <item> ++ <widget class="Q3GroupBox" name="counter_group"> ++ <property name="title"> ++ <string>Events</string> ++ </property> ++ <layout class="QVBoxLayout"> ++ <property name="spacing"> ++ <number>6</number> ++ </property> ++ <property name="margin"> ++ <number>11</number> ++ </property> ++ <item> ++ <layout class="QHBoxLayout"> ++ <property name="spacing"> ++ <number>6</number> + </property> +- <widget> +- <class>QWidget</class> +- <property stdset="1"> +- <name>name</name> +- <cstring>counter_setup_page</cstring> ++ <property name="margin"> ++ <number>0</number> ++ </property> ++ <item> ++ <widget class="Q3ListView" name="events_list"> ++ <property name="minimumSize"> ++ <size> ++ <width>250</width> ++ <height>0</height> ++ </size> ++ </property> ++ <property name="toolTip"> ++ <string>Available events</string> ++ </property> ++ <property name="selectionMode"> ++ <enum>Q3ListView::Multi</enum> ++ </property> ++ <column> ++ <property name="text"> ++ <string>Removedincode</string> ++ </property> ++ <property name="clickable"> ++ <bool>false</bool> ++ </property> ++ <property name="resizable"> ++ <bool>true</bool> ++ </property> ++ </column> ++ </widget> ++ </item> ++ <item> ++ <layout class="QVBoxLayout"> ++ <property name="spacing"> ++ <number>6</number> ++ </property> ++ <property name="margin"> ++ <number>0</number> ++ </property> ++ <item> ++ <widget class="QCheckBox" name="os_ring_count_cb"> ++ <property name="toolTip"> ++ <string>Profile kernel code</string> + </property> +- <attribute> +- <name>title</name> +- <string>&Setup</string> +- </attribute> +- <vbox> +- <property stdset="1"> +- <name>margin</name> +- <number>11</number> +- </property> +- <property stdset="1"> +- <name>spacing</name> +- <number>6</number> +- </property> +- <widget> +- <class>QGroupBox</class> +- <property stdset="1"> +- <name>name</name> +- <cstring>counter_group</cstring> +- </property> +- <property stdset="1"> +- <name>title</name> +- <string>Events</string> +- </property> +- <vbox> +- <property stdset="1"> +- <name>margin</name> +- <number>11</number> +- </property> +- <property stdset="1"> +- <name>spacing</name> +- <number>6</number> +- </property> +- <widget> +- <class>QLayoutWidget</class> +- <property stdset="1"> +- <name>name</name> +- <cstring>Layout10</cstring> +- </property> +- <hbox> +- <property stdset="1"> +- <name>margin</name> +- <number>0</number> +- </property> +- <property stdset="1"> +- <name>spacing</name> +- <number>6</number> +- </property> +- <widget> +- <class>QListView</class> +- <column> +- <property> +- <name>text</name> +- <string>Removedincode</string> +- </property> +- <property> +- <name>clickable</name> +- <bool>false</bool> +- </property> +- <property> +- <name>resizeable</name> +- <bool>true</bool> +- </property> +- </column> +- <property stdset="1"> +- <name>name</name> +- <cstring>events_list</cstring> +- </property> +- <property stdset="1"> +- <name>minimumSize</name> +- <size> +- <width>250</width> +- <height>0</height> +- </size> +- </property> +- <property stdset="1"> +- <name>selectionMode</name> +- <enum>Multi</enum> +- </property> +- <property> +- <name>toolTip</name> +- <string>Available events</string> +- </property> +- </widget> +- <widget> +- <class>QLayoutWidget</class> +- <property stdset="1"> +- <name>name</name> +- <cstring>Layout9</cstring> +- </property> +- <vbox> +- <property stdset="1"> +- <name>margin</name> +- <number>0</number> +- </property> +- <property stdset="1"> +- <name>spacing</name> +- <number>6</number> +- </property> +- <widget> +- <class>QCheckBox</class> +- <property stdset="1"> +- <name>name</name> +- <cstring>os_ring_count_cb</cstring> +- </property> +- <property stdset="1"> +- <name>text</name> +- <string>Profile &kernel</string> +- </property> +- <property> +- <name>toolTip</name> +- <string>Profile kernel code</string> +- </property> +- </widget> +- <widget> +- <class>QCheckBox</class> +- <property stdset="1"> +- <name>name</name> +- <cstring>user_ring_count_cb</cstring> +- </property> +- <property stdset="1"> +- <name>text</name> +- <string>Profile &user binaries</string> +- </property> +- <property> +- <name>toolTip</name> +- <string>Profile user libraries and applications</string> +- </property> +- </widget> +- <widget> +- <class>QLayoutWidget</class> +- <property stdset="1"> +- <name>name</name> +- <cstring>Layout16</cstring> +- </property> +- <hbox> +- <property stdset="1"> +- <name>margin</name> +- <number>0</number> +- </property> +- <property stdset="1"> +- <name>spacing</name> +- <number>6</number> +- </property> +- <widget> +- <class>QLabel</class> +- <property stdset="1"> +- <name>name</name> +- <cstring>TextLabel1_2</cstring> +- </property> +- <property stdset="1"> +- <name>text</name> +- <string>C&ount</string> +- </property> +- <property> +- <name>buddy</name> +- <cstring>event_count_edit</cstring> +- </property> +- </widget> +- <widget> +- <class>QLineEdit</class> +- <property stdset="1"> +- <name>name</name> +- <cstring>event_count_edit</cstring> +- </property> +- <property stdset="1"> +- <name>sizePolicy</name> +- <sizepolicy> +- <hsizetype>1</hsizetype> +- <vsizetype>0</vsizetype> +- </sizepolicy> +- </property> +- <property> +- <name>toolTip</name> +- <string>Set the count value</string> +- </property> +- </widget> +- <spacer> +- <property> +- <name>name</name> +- <cstring>Spacer13_2</cstring> +- </property> +- <property stdset="1"> +- <name>orientation</name> +- <enum>Horizontal</enum> +- </property> +- <property stdset="1"> +- <name>sizeType</name> +- <enum>Expanding</enum> +- </property> +- <property> +- <name>sizeHint</name> +- <size> +- <width>20</width> +- <height>20</height> +- </size> +- </property> +- </spacer> +- </hbox> +- </widget> +- <widget> +- <class>QButtonGroup</class> +- <property stdset="1"> +- <name>name</name> +- <cstring>unit_mask_group</cstring> +- </property> +- <property stdset="1"> +- <name>sizePolicy</name> +- <sizepolicy> +- <hsizetype>1</hsizetype> +- <vsizetype>5</vsizetype> +- </sizepolicy> +- </property> +- <property stdset="1"> +- <name>title</name> +- <string>Unit mask</string> +- </property> +- <property> +- <name>toolTip</name> +- <string>Unit mask settings for this event</string> +- </property> +- <grid> +- <property stdset="1"> +- <name>margin</name> +- <number>11</number> +- </property> +- <property stdset="1"> +- <name>spacing</name> +- <number>6</number> +- </property> +- <widget row="0" column="0" > +- <class>QCheckBox</class> +- <property stdset="1"> +- <name>name</name> +- <cstring>check0</cstring> +- </property> +- <property stdset="1"> +- <name>text</name> +- <string>check0</string> +- </property> +- </widget> +- <widget row="1" column="0" rowspan="2" colspan="2" > +- <class>QCheckBox</class> +- <property stdset="1"> +- <name>name</name> +- <cstring>check1</cstring> +- </property> +- <property stdset="1"> +- <name>text</name> +- <string>check1</string> +- </property> +- </widget> +- <widget row="3" column="0" rowspan="2" colspan="2" > +- <class>QCheckBox</class> +- <property stdset="1"> +- <name>name</name> +- <cstring>check2</cstring> +- </property> +- <property stdset="1"> +- <name>text</name> +- <string>check2</string> +- </property> +- </widget> +- <widget row="5" column="0" > +- <class>QCheckBox</class> +- <property stdset="1"> +- <name>name</name> +- <cstring>check3</cstring> +- </property> +- <property stdset="1"> +- <name>text</name> +- <string>check3</string> +- </property> +- </widget> +- <widget row="6" column="0" > +- <class>QCheckBox</class> +- <property stdset="1"> +- <name>name</name> +- <cstring>check4</cstring> +- </property> +- <property stdset="1"> +- <name>text</name> +- <string>check4</string> +- </property> +- </widget> +- <widget row="7" column="0" > +- <class>QCheckBox</class> +- <property stdset="1"> +- <name>name</name> +- <cstring>check5</cstring> +- </property> +- <property stdset="1"> +- <name>text</name> +- <string>check5</string> +- </property> +- </widget> +- <widget row="8" column="0" rowspan="2" colspan="2" > +- <class>QCheckBox</class> +- <property stdset="1"> +- <name>name</name> +- <cstring>check6</cstring> +- </property> +- <property stdset="1"> +- <name>text</name> +- <string>check6</string> +- </property> +- </widget> +- <widget row="10" column="0" > +- <class>QCheckBox</class> +- <property stdset="1"> +- <name>name</name> +- <cstring>check7</cstring> +- </property> +- <property stdset="1"> +- <name>text</name> +- <string>check7</string> +- </property> +- </widget> +- <spacer row="11" column="1" > +- <property> +- <name>name</name> +- <cstring>Spacer14</cstring> +- </property> +- <property stdset="1"> +- <name>orientation</name> +- <enum>Vertical</enum> +- </property> +- <property stdset="1"> +- <name>sizeType</name> +- <enum>Expanding</enum> +- </property> +- <property> +- <name>sizeHint</name> +- <size> +- <width>20</width> +- <height>20</height> +- </size> +- </property> +- </spacer> +- <widget row="5" column="1" > +- <class>QCheckBox</class> +- <property stdset="1"> +- <name>name</name> +- <cstring>check11</cstring> +- </property> +- <property stdset="1"> +- <name>text</name> +- <string>check11</string> +- </property> +- </widget> +- <widget row="7" column="1" > +- <class>QCheckBox</class> +- <property stdset="1"> +- <name>name</name> +- <cstring>check13</cstring> +- </property> +- <property stdset="1"> +- <name>text</name> +- <string>check13</string> +- </property> +- </widget> +- <widget row="10" column="1" > +- <class>QCheckBox</class> +- <property stdset="1"> +- <name>name</name> +- <cstring>check15</cstring> +- </property> +- <property stdset="1"> +- <name>text</name> +- <string>check15</string> +- </property> +- </widget> +- <widget row="4" column="1" > +- <class>QCheckBox</class> +- <property stdset="1"> +- <name>name</name> +- <cstring>check10</cstring> +- </property> +- <property stdset="1"> +- <name>text</name> +- <string>check10</string> +- </property> +- </widget> +- <widget row="9" column="1" > +- <class>QCheckBox</class> +- <property stdset="1"> +- <name>name</name> +- <cstring>check14</cstring> +- </property> +- <property stdset="1"> +- <name>text</name> +- <string>check14</string> +- </property> +- </widget> +- <widget row="2" column="1" > +- <class>QCheckBox</class> +- <property stdset="1"> +- <name>name</name> +- <cstring>check9</cstring> +- </property> +- <property stdset="1"> +- <name>text</name> +- <string>check9</string> +- </property> +- </widget> +- <widget row="0" column="1" > +- <class>QCheckBox</class> +- <property stdset="1"> +- <name>name</name> +- <cstring>check8</cstring> +- </property> +- <property stdset="1"> +- <name>text</name> +- <string>check8</string> +- </property> +- </widget> +- <widget row="6" column="1" > +- <class>QCheckBox</class> +- <property stdset="1"> +- <name>name</name> +- <cstring>check12</cstring> +- </property> +- <property stdset="1"> +- <name>text</name> +- <string>check12</string> +- </property> +- </widget> +- </grid> +- </widget> +- </vbox> +- </widget> +- </hbox> +- </widget> +- <widget> +- <class>QLabel</class> +- <property stdset="1"> +- <name>name</name> +- <cstring>event_help_label</cstring> +- </property> +- <property stdset="1"> +- <name>enabled</name> +- <bool>true</bool> +- </property> +- <property stdset="1"> +- <name>sizePolicy</name> +- <sizepolicy> +- <hsizetype>1</hsizetype> +- <vsizetype>1</vsizetype> +- </sizepolicy> +- </property> +- <property stdset="1"> +- <name>frameShape</name> +- <enum>WinPanel</enum> +- </property> +- <property stdset="1"> +- <name>frameShadow</name> +- <enum>Sunken</enum> +- </property> +- <property stdset="1"> +- <name>text</name> +- <string></string> +- </property> +- </widget> +- </vbox> +- </widget> +- </vbox> +- </widget> +- <widget> +- <class>QWidget</class> +- <property stdset="1"> +- <name>name</name> +- <cstring>configuration_page</cstring> ++ <property name="text"> ++ <string>Profile &kernel</string> + </property> +- <attribute> +- <name>title</name> +- <string>&Configuration</string> +- </attribute> +- <vbox> +- <property stdset="1"> +- <name>margin</name> +- <number>11</number> +- </property> +- <property stdset="1"> +- <name>spacing</name> +- <number>6</number> +- </property> +- <widget> +- <class>QLayoutWidget</class> +- <property stdset="1"> +- <name>name</name> +- <cstring>Layout11</cstring> +- </property> +- <hbox> +- <property stdset="1"> +- <name>margin</name> +- <number>0</number> +- </property> +- <property stdset="1"> +- <name>spacing</name> +- <number>6</number> +- </property> +- <widget> +- <class>QLabel</class> +- <property stdset="1"> +- <name>name</name> +- <cstring>TextLabel1</cstring> +- </property> +- <property stdset="1"> +- <name>text</name> +- <string>&Kernel image file</string> +- </property> +- <property> +- <name>buddy</name> +- <cstring>kernel_filename_edit</cstring> +- </property> +- </widget> +- <widget> +- <class>QLineEdit</class> +- <property stdset="1"> +- <name>name</name> +- <cstring>kernel_filename_edit</cstring> +- </property> +- <property> +- <name>toolTip</name> +- <string>The vmlinux file of the running kernel</string> +- </property> +- </widget> +- <widget> +- <class>QToolButton</class> +- <property stdset="1"> +- <name>name</name> +- <cstring>kernel_filename_tb</cstring> +- </property> +- <property stdset="1"> +- <name>text</name> +- <string>...</string> +- </property> +- </widget> +- <widget> +- <class>QCheckBox</class> +- <property stdset="1"> +- <name>name</name> +- <cstring>no_vmlinux</cstring> +- </property> +- <property stdset="1"> +- <name>text</name> +- <string>No kernel image</string> +- </property> +- <property> +- <name>toolTip</name> +- <string>No kernel image available. Disables kernel profiling.</string> +- </property> +- </widget> +- </hbox> +- </widget> +- <widget> +- <class>QLayoutWidget</class> +- <property stdset="1"> +- <name>name</name> +- <cstring>Layout12</cstring> +- </property> +- <hbox> +- <property stdset="1"> +- <name>margin</name> +- <number>0</number> +- </property> +- <property stdset="1"> +- <name>spacing</name> +- <number>6</number> +- </property> +- <widget> +- <class>QLayoutWidget</class> +- <property stdset="1"> +- <name>name</name> +- <cstring>Layout11</cstring> +- </property> +- <grid> +- <property stdset="1"> +- <name>margin</name> +- <number>0</number> +- </property> +- <property stdset="1"> +- <name>spacing</name> +- <number>6</number> +- </property> +- <widget row="0" column="1" > +- <class>QLineEdit</class> +- <property stdset="1"> +- <name>name</name> +- <cstring>buffer_size_edit</cstring> +- </property> +- <property> +- <name>toolTip</name> +- <string>The size of the profiler's buffers</string> +- </property> +- </widget> +- <widget row="1" column="1" > +- <class>QLineEdit</class> +- <property stdset="1"> +- <name>name</name> +- <cstring>note_table_size_edit</cstring> +- </property> +- </widget> +- <widget row="3" column="0" > +- <class>QLabel</class> +- <property stdset="1"> +- <name>name</name> +- <cstring>cpu_buffer_size_label</cstring> +- </property> +- <property stdset="1"> +- <name>text</name> +- <string>Cpu buffer size</string> +- </property> +- <property> +- <name>buddy</name> +- <cstring>cpu_buffer_size_edit</cstring> +- </property> +- </widget> +- <widget row="3" column="1" > +- <class>QLineEdit</class> +- <property stdset="1"> +- <name>name</name> +- <cstring>cpu_buffer_size_edit</cstring> +- </property> +- </widget> +- <widget row="0" column="0" > +- <class>QLabel</class> +- <property stdset="1"> +- <name>name</name> +- <cstring>buffer_size_label</cstring> +- </property> +- <property stdset="1"> +- <name>text</name> +- <string>&Buffer size</string> +- </property> +- <property> +- <name>buddy</name> +- <cstring>buffer_size_edit</cstring> +- </property> +- </widget> +- <widget row="1" column="0" > +- <class>QLabel</class> +- <property stdset="1"> +- <name>name</name> +- <cstring>note_table_size_label</cstring> +- </property> +- <property stdset="1"> +- <name>text</name> +- <string>Note Size</string> +- </property> +- <property> +- <name>buddy</name> +- <cstring>note_table_size_edit</cstring> +- </property> +- </widget> +- <widget row="2" column="1" > +- <class>QLineEdit</class> +- <property stdset="1"> +- <name>name</name> +- <cstring>buffer_watershed_edit</cstring> +- </property> +- </widget> +- <widget row="2" column="0" > +- <class>QLabel</class> +- <property stdset="1"> +- <name>name</name> +- <cstring>buffer_watershed_label</cstring> +- </property> +- <property stdset="1"> +- <name>text</name> +- <string>Buffer watershed</string> +- </property> +- <property> +- <name>buddy</name> +- <cstring>buffer_watershed_edit</cstring> +- </property> +- </widget> +- </grid> +- </widget> +- <spacer> +- <property> +- <name>name</name> +- <cstring>Spacer11</cstring> +- </property> +- <property stdset="1"> +- <name>orientation</name> +- <enum>Horizontal</enum> +- </property> +- <property stdset="1"> +- <name>sizeType</name> +- <enum>Expanding</enum> +- </property> +- <property> +- <name>sizeHint</name> +- <size> +- <width>20</width> +- <height>20</height> +- </size> +- </property> +- </spacer> +- </hbox> +- </widget> +- <widget> +- <class>QLayoutWidget</class> +- <property stdset="1"> +- <name>name</name> +- <cstring>Layout36</cstring> +- </property> +- <grid> +- <property stdset="1"> +- <name>margin</name> +- <number>0</number> +- </property> +- <property stdset="1"> +- <name>spacing</name> +- <number>6</number> +- </property> +- <widget row="0" column="0" > +- <class>QLayoutWidget</class> +- <property stdset="1"> +- <name>name</name> +- <cstring>Layout34</cstring> +- </property> +- <vbox> +- <property stdset="1"> +- <name>margin</name> +- <number>0</number> +- </property> +- <property stdset="1"> +- <name>spacing</name> +- <number>6</number> +- </property> +- <widget> +- <class>QCheckBox</class> +- <property stdset="1"> +- <name>name</name> +- <cstring>verbose</cstring> +- </property> +- <property stdset="1"> +- <name>text</name> +- <string>&Verbose</string> +- </property> +- <property> +- <name>toolTip</name> +- <string>Very verbose output in log file</string> +- </property> +- </widget> +- <widget> +- <class>QCheckBox</class> +- <property stdset="1"> +- <name>name</name> +- <cstring>separate_lib_cb</cstring> +- </property> +- <property stdset="1"> +- <name>text</name> +- <string>Per-application profiles</string> +- </property> +- <property> +- <name>toolTip</name> +- <string>Separate samples for each shared library. This increases the time and space overhead of OProfile.</string> +- </property> +- </widget> +- <widget> +- <class>QCheckBox</class> +- <property stdset="1"> +- <name>name</name> +- <cstring>separate_kernel_cb</cstring> +- </property> +- <property stdset="1"> +- <name>text</name> +- <string>Per-application profiles, including kernel</string> +- </property> +- <property> +- <name>toolTip</name> +- <string>Separate samples for each shared library and kernel samples. This increases the time and space overhead of OProfile.</string> +- </property> +- </widget> +- <widget> +- <class>QCheckBox</class> +- <property stdset="1"> +- <name>name</name> +- <cstring>separate_cpu_cb</cstring> +- </property> +- <property stdset="1"> +- <name>text</name> +- <string>Per-CPU profiles</string> +- </property> +- <property> +- <name>toolTip</name> +- <string>Separate samples for each shared library and kernel samples. This increases the time and space overhead of OProfile.</string> +- </property> +- </widget> +- <widget> +- <class>QCheckBox</class> +- <property stdset="1"> +- <name>name</name> +- <cstring>separate_thread_cb</cstring> +- </property> +- <property stdset="1"> +- <name>text</name> +- <string>Per-thread/task profiles</string> +- </property> +- <property> +- <name>toolTip</name> +- <string>Separate samples for each shared library and kernel samples. This increases the time and space overhead of OProfile.</string> +- </property> +- </widget> +- <widget> +- <class>QLayoutWidget</class> +- <property stdset="1"> +- <name>name</name> +- <cstring>Layout33</cstring> +- </property> +- <hbox> +- <property stdset="1"> +- <name>margin</name> +- <number>0</number> +- </property> +- <property stdset="1"> +- <name>spacing</name> +- <number>6</number> +- </property> +- <widget> +- <class>QLabel</class> +- <property stdset="1"> +- <name>name</name> +- <cstring>callgraph_depth_label</cstring> +- </property> +- <property stdset="1"> +- <name>text</name> +- <string>callgraph depth, zero to disable</string> +- </property> +- <property> +- <name>buddy</name> +- <cstring>callgraph_depth_edit</cstring> +- </property> +- </widget> +- <widget> +- <class>QLineEdit</class> +- <property stdset="1"> +- <name>name</name> +- <cstring>callgraph_depth_edit</cstring> +- </property> +- </widget> +- </hbox> +- </widget> +- </vbox> +- </widget> +- <spacer row="0" column="1" > +- <property> +- <name>name</name> +- <cstring>Spacer12</cstring> +- </property> +- <property stdset="1"> +- <name>orientation</name> +- <enum>Horizontal</enum> +- </property> +- <property stdset="1"> +- <name>sizeType</name> +- <enum>Expanding</enum> +- </property> +- <property> +- <name>sizeHint</name> +- <size> +- <width>20</width> +- <height>20</height> +- </size> +- </property> +- </spacer> +- </grid> +- </widget> +- <spacer> +- <property> +- <name>name</name> +- <cstring>Spacer9</cstring> +- </property> +- <property stdset="1"> +- <name>orientation</name> +- <enum>Vertical</enum> +- </property> +- <property stdset="1"> +- <name>sizeType</name> +- <enum>Expanding</enum> +- </property> +- <property> +- <name>sizeHint</name> +- <size> +- <width>20</width> +- <height>20</height> +- </size> +- </property> +- </spacer> +- </vbox> +- </widget> +- </widget> +- <widget> +- <class>QLabel</class> +- <property stdset="1"> +- <name>name</name> +- <cstring>daemon_label</cstring> ++ </widget> ++ </item> ++ <item> ++ <widget class="QCheckBox" name="user_ring_count_cb"> ++ <property name="toolTip"> ++ <string>Profile user libraries and applications</string> ++ </property> ++ <property name="text"> ++ <string>Profile &user binaries</string> ++ </property> ++ </widget> ++ </item> ++ <item> ++ <layout class="QHBoxLayout"> ++ <property name="spacing"> ++ <number>6</number> ++ </property> ++ <property name="margin"> ++ <number>0</number> ++ </property> ++ <item> ++ <widget class="QLabel" name="TextLabel1_2"> ++ <property name="text"> ++ <string>C&ount</string> ++ </property> ++ <property name="wordWrap"> ++ <bool>false</bool> ++ </property> ++ <property name="buddy"> ++ <cstring>event_count_edit</cstring> ++ </property> ++ </widget> ++ </item> ++ <item> ++ <widget class="QLineEdit" name="event_count_edit"> ++ <property name="sizePolicy"> ++ <sizepolicy hsizetype="Minimum" vsizetype="Fixed"> ++ <horstretch>0</horstretch> ++ <verstretch>0</verstretch> ++ </sizepolicy> ++ </property> ++ <property name="toolTip"> ++ <string>Set the count value</string> ++ </property> ++ </widget> ++ </item> ++ <item> ++ <spacer name="Spacer13_2"> ++ <property name="orientation"> ++ <enum>Qt::Horizontal</enum> ++ </property> ++ <property name="sizeType"> ++ <enum>QSizePolicy::Expanding</enum> ++ </property> ++ <property name="sizeHint" stdset="0"> ++ <size> ++ <width>20</width> ++ <height>20</height> ++ </size> ++ </property> ++ </spacer> ++ </item> ++ </layout> ++ </item> ++ <item> ++ <widget class="Q3ButtonGroup" name="unit_mask_group"> ++ <property name="sizePolicy"> ++ <sizepolicy hsizetype="Minimum" vsizetype="Preferred"> ++ <horstretch>0</horstretch> ++ <verstretch>0</verstretch> ++ </sizepolicy> ++ </property> ++ <property name="toolTip"> ++ <string>Unit mask settings for this event</string> ++ </property> ++ <property name="title"> ++ <string>Unit mask</string> ++ </property> ++ <layout class="QGridLayout"> ++ <property name="margin"> ++ <number>11</number> ++ </property> ++ <property name="spacing"> ++ <number>6</number> ++ </property> ++ <item row="0" column="0"> ++ <widget class="QCheckBox" name="check0"> ++ <property name="text"> ++ <string>check0</string> ++ </property> ++ <attribute name="buttonGroup"> ++ <string/> ++ </attribute> ++ </widget> ++ </item> ++ <item row="1" column="0" rowspan="2" colspan="2"> ++ <widget class="QCheckBox" name="check1"> ++ <property name="text"> ++ <string>check1</string> ++ </property> ++ <attribute name="buttonGroup"> ++ <string/> ++ </attribute> ++ </widget> ++ </item> ++ <item row="3" column="0" rowspan="2" colspan="2"> ++ <widget class="QCheckBox" name="check2"> ++ <property name="text"> ++ <string>check2</string> ++ </property> ++ <attribute name="buttonGroup"> ++ <string/> ++ </attribute> ++ </widget> ++ </item> ++ <item row="5" column="0"> ++ <widget class="QCheckBox" name="check3"> ++ <property name="text"> ++ <string>check3</string> ++ </property> ++ <attribute name="buttonGroup"> ++ <string/> ++ </attribute> ++ </widget> ++ </item> ++ <item row="6" column="0"> ++ <widget class="QCheckBox" name="check4"> ++ <property name="text"> ++ <string>check4</string> ++ </property> ++ <attribute name="buttonGroup"> ++ <string/> ++ </attribute> ++ </widget> ++ </item> ++ <item row="7" column="0"> ++ <widget class="QCheckBox" name="check5"> ++ <property name="text"> ++ <string>check5</string> ++ </property> ++ <attribute name="buttonGroup"> ++ <string/> ++ </attribute> ++ </widget> ++ </item> ++ <item row="8" column="0" rowspan="2" colspan="2"> ++ <widget class="QCheckBox" name="check6"> ++ <property name="text"> ++ <string>check6</string> ++ </property> ++ <attribute name="buttonGroup"> ++ <string/> ++ </attribute> ++ </widget> ++ </item> ++ <item row="10" column="0"> ++ <widget class="QCheckBox" name="check7"> ++ <property name="text"> ++ <string>check7</string> ++ </property> ++ <attribute name="buttonGroup"> ++ <string/> ++ </attribute> ++ </widget> ++ </item> ++ <item row="11" column="1"> ++ <spacer name="Spacer14"> ++ <property name="orientation"> ++ <enum>Qt::Vertical</enum> ++ </property> ++ <property name="sizeType"> ++ <enum>QSizePolicy::Expanding</enum> ++ </property> ++ <property name="sizeHint" stdset="0"> ++ <size> ++ <width>20</width> ++ <height>20</height> ++ </size> ++ </property> ++ </spacer> ++ </item> ++ <item row="5" column="1"> ++ <widget class="QCheckBox" name="check11"> ++ <property name="text"> ++ <string>check11</string> ++ </property> ++ <attribute name="buttonGroup"> ++ <string/> ++ </attribute> ++ </widget> ++ </item> ++ <item row="7" column="1"> ++ <widget class="QCheckBox" name="check13"> ++ <property name="text"> ++ <string>check13</string> ++ </property> ++ <attribute name="buttonGroup"> ++ <string/> ++ </attribute> ++ </widget> ++ </item> ++ <item row="10" column="1"> ++ <widget class="QCheckBox" name="check15"> ++ <property name="text"> ++ <string>check15</string> ++ </property> ++ <attribute name="buttonGroup"> ++ <string/> ++ </attribute> ++ </widget> ++ </item> ++ <item row="4" column="1"> ++ <widget class="QCheckBox" name="check10"> ++ <property name="text"> ++ <string>check10</string> ++ </property> ++ <attribute name="buttonGroup"> ++ <string/> ++ </attribute> ++ </widget> ++ </item> ++ <item row="9" column="1"> ++ <widget class="QCheckBox" name="check14"> ++ <property name="text"> ++ <string>check14</string> ++ </property> ++ <attribute name="buttonGroup"> ++ <string/> ++ </attribute> ++ </widget> ++ </item> ++ <item row="2" column="1"> ++ <widget class="QCheckBox" name="check9"> ++ <property name="text"> ++ <string>check9</string> ++ </property> ++ <attribute name="buttonGroup"> ++ <string/> ++ </attribute> ++ </widget> ++ </item> ++ <item row="0" column="1"> ++ <widget class="QCheckBox" name="check8"> ++ <property name="text"> ++ <string>check8</string> ++ </property> ++ <attribute name="buttonGroup"> ++ <string/> ++ </attribute> ++ </widget> ++ </item> ++ <item row="6" column="1"> ++ <widget class="QCheckBox" name="check12"> ++ <property name="text"> ++ <string>check12</string> ++ </property> ++ <attribute name="buttonGroup"> ++ <string/> ++ </attribute> ++ </widget> ++ </item> ++ </layout> ++ </widget> ++ </item> ++ </layout> ++ </item> ++ </layout> ++ </item> ++ <item> ++ <widget class="QLabel" name="event_help_label"> ++ <property name="enabled"> ++ <bool>true</bool> + </property> +- <property stdset="1"> +- <name>frameShape</name> +- <enum>Panel</enum> ++ <property name="sizePolicy"> ++ <sizepolicy hsizetype="Minimum" vsizetype="Minimum"> ++ <horstretch>0</horstretch> ++ <verstretch>0</verstretch> ++ </sizepolicy> + </property> +- <property stdset="1"> +- <name>frameShadow</name> +- <enum>Sunken</enum> ++ <property name="frameShape"> ++ <enum>QFrame::Panel</enum> + </property> +- <property stdset="1"> +- <name>text</name> +- <string></string> ++ <property name="frameShadow"> ++ <enum>QFrame::Sunken</enum> + </property> +- <property> +- <name>toolTip</name> +- <string>Current daemon status</string> ++ <property name="text"> ++ <string/> + </property> +- </widget> +- <widget> +- <class>QLayoutWidget</class> +- <property stdset="1"> +- <name>name</name> +- <cstring>Layout37</cstring> ++ <property name="wordWrap"> ++ <bool>false</bool> + </property> +- <hbox> +- <property stdset="1"> +- <name>margin</name> +- <number>0</number> +- </property> +- <property stdset="1"> +- <name>spacing</name> +- <number>6</number> +- </property> +- <widget> +- <class>QPushButton</class> +- <property stdset="1"> +- <name>name</name> +- <cstring>start_profiler_btn</cstring> +- </property> +- <property stdset="1"> +- <name>text</name> +- <string>St&art</string> +- </property> +- </widget> +- <widget> +- <class>QPushButton</class> +- <property stdset="1"> +- <name>name</name> +- <cstring>flush_profiler_data_btn</cstring> +- </property> +- <property stdset="1"> +- <name>text</name> +- <string>&Flush</string> +- </property> +- </widget> +- <widget> +- <class>QPushButton</class> +- <property stdset="1"> +- <name>name</name> +- <cstring>stop_profiler_btn</cstring> +- </property> +- <property stdset="1"> +- <name>text</name> +- <string>Stop</string> +- </property> +- </widget> +- <spacer> +- <property> +- <name>name</name> +- <cstring>Spacer5</cstring> +- </property> +- <property stdset="1"> +- <name>orientation</name> +- <enum>Horizontal</enum> +- </property> +- <property stdset="1"> +- <name>sizeType</name> +- <enum>Expanding</enum> +- </property> +- <property> +- <name>sizeHint</name> +- <size> +- <width>20</width> +- <height>20</height> +- </size> +- </property> +- </spacer> +- <widget> +- <class>QPushButton</class> +- <property stdset="1"> +- <name>name</name> +- <cstring>reset_sample_files_btn</cstring> +- </property> +- <property stdset="1"> +- <name>text</name> +- <string>Reset sample files</string> +- </property> +- </widget> +- <widget> +- <class>QPushButton</class> +- <property stdset="1"> +- <name>name</name> +- <cstring>quit_and_save_btn</cstring> +- </property> +- <property stdset="1"> +- <name>text</name> +- <string>Save and &quit</string> +- </property> +- <property stdset="1"> +- <name>autoDefault</name> +- <bool>true</bool> +- </property> +- </widget> +- </hbox> ++ </widget> ++ </item> ++ </layout> + </widget> +- </vbox> +-</widget> +-<connections> +- <connection> +- <sender>start_profiler_btn</sender> +- <signal>clicked()</signal> +- <receiver>oprof_start_base</receiver> +- <slot>on_start_profiler()</slot> +- </connection> +- <connection> +- <sender>stop_profiler_btn</sender> +- <signal>clicked()</signal> +- <receiver>oprof_start_base</receiver> +- <slot>on_stop_profiler()</slot> +- </connection> +- <connection> +- <sender>flush_profiler_data_btn</sender> +- <signal>clicked()</signal> +- <receiver>oprof_start_base</receiver> +- <slot>on_flush_profiler_data()</slot> +- </connection> +- <connection> +- <sender>quit_and_save_btn</sender> +- <signal>clicked()</signal> +- <receiver>oprof_start_base</receiver> +- <slot>accept()</slot> +- </connection> +- <connection> +- <sender>kernel_filename_tb</sender> +- <signal>clicked()</signal> +- <receiver>oprof_start_base</receiver> +- <slot>choose_kernel_filename()</slot> +- </connection> +- <connection> +- <sender>no_vmlinux</sender> +- <signal>toggled(bool)</signal> +- <receiver>kernel_filename_tb</receiver> +- <slot>setDisabled(bool)</slot> +- </connection> +- <connection> +- <sender>no_vmlinux</sender> +- <signal>toggled(bool)</signal> +- <receiver>kernel_filename_edit</receiver> +- <slot>setDisabled(bool)</slot> +- </connection> +- <connection> +- <sender>no_vmlinux</sender> +- <signal>toggled(bool)</signal> +- <receiver>TextLabel1</receiver> +- <slot>setDisabled(bool)</slot> +- </connection> +- <connection> +- <sender>separate_kernel_cb</sender> +- <signal>stateChanged(int)</signal> +- <receiver>oprof_start_base</receiver> +- <slot>on_separate_kernel_cb_changed(int)</slot> +- </connection> +- <connection> +- <sender>reset_sample_files_btn</sender> +- <signal>clicked()</signal> +- <receiver>oprof_start_base</receiver> +- <slot>on_reset_sample_files()</slot> +- </connection> +- <connection> +- <sender>events_list</sender> +- <signal>selectionChanged()</signal> +- <receiver>oprof_start_base</receiver> +- <slot>event_selected()</slot> +- </connection> +- <connection> +- <sender>events_list</sender> +- <signal>currentChanged(QListViewItem*)</signal> +- <receiver>oprof_start_base</receiver> +- <slot>event_over(QListViewItem *)</slot> +- </connection> +- <connection> +- <sender>events_list</sender> +- <signal>onItem(QListViewItem*)</signal> +- <receiver>oprof_start_base</receiver> +- <slot>event_over(QListViewItem *)</slot> +- </connection> +- <slot access="protected">choose_kernel_filename()</slot> +- <slot access="protected">event_over(QListViewItem *)</slot> +- <slot access="protected">event_selected()</slot> +- <slot access="protected">on_reset_sample_files()</slot> +- <slot access="protected">on_flush_profiler_data()</slot> +- <slot access="protected">on_separate_kernel_cb_changed(int)</slot> +- <slot access="protected">on_start_profiler()</slot> +- <slot access="protected">on_stop_profiler()</slot> +-</connections> +-<tabstops> +- <tabstop>setup_config_tab</tabstop> +- <tabstop>events_list</tabstop> +- <tabstop>os_ring_count_cb</tabstop> +- <tabstop>user_ring_count_cb</tabstop> +- <tabstop>event_count_edit</tabstop> +- <tabstop>check0</tabstop> +- <tabstop>check1</tabstop> +- <tabstop>check2</tabstop> +- <tabstop>check3</tabstop> +- <tabstop>check4</tabstop> +- <tabstop>check5</tabstop> +- <tabstop>check6</tabstop> +- <tabstop>check7</tabstop> +- <tabstop>check8</tabstop> +- <tabstop>check9</tabstop> +- <tabstop>check10</tabstop> +- <tabstop>check11</tabstop> +- <tabstop>check12</tabstop> +- <tabstop>check13</tabstop> +- <tabstop>check14</tabstop> +- <tabstop>check15</tabstop> +- <tabstop>start_profiler_btn</tabstop> +- <tabstop>flush_profiler_data_btn</tabstop> +- <tabstop>stop_profiler_btn</tabstop> +- <tabstop>reset_sample_files_btn</tabstop> +- <tabstop>quit_and_save_btn</tabstop> +- <tabstop>kernel_filename_edit</tabstop> +- <tabstop>no_vmlinux</tabstop> +- <tabstop>buffer_size_edit</tabstop> +- <tabstop>note_table_size_edit</tabstop> +- <tabstop>buffer_watershed_edit</tabstop> +- <tabstop>verbose</tabstop> +- <tabstop>separate_lib_cb</tabstop> +- <tabstop>separate_kernel_cb</tabstop> +- <tabstop>separate_cpu_cb</tabstop> +- <tabstop>separate_thread_cb</tabstop> +- <tabstop>callgraph_depth_edit</tabstop> +-</tabstops> +-</UI> ++ </item> ++ </layout> ++ </widget> ++ <widget class="QWidget" name="configuration_page"> ++ <attribute name="title"> ++ <string>&Configuration</string> ++ </attribute> ++ <layout class="QVBoxLayout"> ++ <property name="spacing"> ++ <number>6</number> ++ </property> ++ <property name="margin"> ++ <number>11</number> ++ </property> ++ <item> ++ <layout class="QHBoxLayout"> ++ <property name="spacing"> ++ <number>6</number> ++ </property> ++ <property name="margin"> ++ <number>0</number> ++ </property> ++ <item> ++ <widget class="QLabel" name="TextLabel1"> ++ <property name="text"> ++ <string>&Kernel image file</string> ++ </property> ++ <property name="wordWrap"> ++ <bool>false</bool> ++ </property> ++ <property name="buddy"> ++ <cstring>kernel_filename_edit</cstring> ++ </property> ++ </widget> ++ </item> ++ <item> ++ <widget class="QLineEdit" name="kernel_filename_edit"> ++ <property name="toolTip"> ++ <string>The vmlinux file of the running kernel</string> ++ </property> ++ </widget> ++ </item> ++ <item> ++ <widget class="QToolButton" name="kernel_filename_tb"> ++ <property name="text"> ++ <string>...</string> ++ </property> ++ </widget> ++ </item> ++ <item> ++ <widget class="QCheckBox" name="no_vmlinux"> ++ <property name="toolTip"> ++ <string>No kernel image available. Disables kernel profiling.</string> ++ </property> ++ <property name="text"> ++ <string>No kernel image</string> ++ </property> ++ </widget> ++ </item> ++ </layout> ++ </item> ++ <item> ++ <layout class="QHBoxLayout"> ++ <property name="spacing"> ++ <number>6</number> ++ </property> ++ <property name="margin"> ++ <number>0</number> ++ </property> ++ <item> ++ <layout class="QGridLayout"> ++ <property name="margin"> ++ <number>0</number> ++ </property> ++ <property name="spacing"> ++ <number>6</number> ++ </property> ++ <item row="0" column="1"> ++ <widget class="QLineEdit" name="buffer_size_edit"> ++ <property name="toolTip"> ++ <string>The size of the profiler's buffers</string> ++ </property> ++ </widget> ++ </item> ++ <item row="1" column="1"> ++ <widget class="QLineEdit" name="note_table_size_edit"/> ++ </item> ++ <item row="3" column="0"> ++ <widget class="QLabel" name="cpu_buffer_size_label"> ++ <property name="text"> ++ <string>Cpu buffer size</string> ++ </property> ++ <property name="wordWrap"> ++ <bool>false</bool> ++ </property> ++ <property name="buddy"> ++ <cstring>cpu_buffer_size_edit</cstring> ++ </property> ++ </widget> ++ </item> ++ <item row="3" column="1"> ++ <widget class="QLineEdit" name="cpu_buffer_size_edit"/> ++ </item> ++ <item row="0" column="0"> ++ <widget class="QLabel" name="buffer_size_label"> ++ <property name="text"> ++ <string>&Buffer size</string> ++ </property> ++ <property name="wordWrap"> ++ <bool>false</bool> ++ </property> ++ <property name="buddy"> ++ <cstring>buffer_size_edit</cstring> ++ </property> ++ </widget> ++ </item> ++ <item row="1" column="0"> ++ <widget class="QLabel" name="note_table_size_label"> ++ <property name="text"> ++ <string>Note Size</string> ++ </property> ++ <property name="wordWrap"> ++ <bool>false</bool> ++ </property> ++ <property name="buddy"> ++ <cstring>note_table_size_edit</cstring> ++ </property> ++ </widget> ++ </item> ++ <item row="2" column="1"> ++ <widget class="QLineEdit" name="buffer_watershed_edit"/> ++ </item> ++ <item row="2" column="0"> ++ <widget class="QLabel" name="buffer_watershed_label"> ++ <property name="text"> ++ <string>Buffer watershed</string> ++ </property> ++ <property name="wordWrap"> ++ <bool>false</bool> ++ </property> ++ <property name="buddy"> ++ <cstring>buffer_watershed_edit</cstring> ++ </property> ++ </widget> ++ </item> ++ </layout> ++ </item> ++ <item> ++ <spacer name="Spacer11"> ++ <property name="orientation"> ++ <enum>Qt::Horizontal</enum> ++ </property> ++ <property name="sizeType"> ++ <enum>QSizePolicy::Expanding</enum> ++ </property> ++ <property name="sizeHint" stdset="0"> ++ <size> ++ <width>20</width> ++ <height>20</height> ++ </size> ++ </property> ++ </spacer> ++ </item> ++ </layout> ++ </item> ++ <item> ++ <layout class="QGridLayout"> ++ <property name="margin"> ++ <number>0</number> ++ </property> ++ <property name="spacing"> ++ <number>6</number> ++ </property> ++ <item row="0" column="0"> ++ <layout class="QVBoxLayout"> ++ <property name="spacing"> ++ <number>6</number> ++ </property> ++ <property name="margin"> ++ <number>0</number> ++ </property> ++ <item> ++ <widget class="QCheckBox" name="verbose"> ++ <property name="toolTip"> ++ <string>Very verbose output in log file</string> ++ </property> ++ <property name="text"> ++ <string>&Verbose</string> ++ </property> ++ </widget> ++ </item> ++ <item> ++ <widget class="QCheckBox" name="separate_lib_cb"> ++ <property name="toolTip"> ++ <string>Separate samples for each shared library. This increases the time and space overhead of OProfile.</string> ++ </property> ++ <property name="text"> ++ <string>Per-application profiles</string> ++ </property> ++ </widget> ++ </item> ++ <item> ++ <widget class="QCheckBox" name="separate_kernel_cb"> ++ <property name="toolTip"> ++ <string>Separate samples for each shared library and kernel samples. This increases the time and space overhead of OProfile.</string> ++ </property> ++ <property name="text"> ++ <string>Per-application profiles, including kernel</string> ++ </property> ++ </widget> ++ </item> ++ <item> ++ <widget class="QCheckBox" name="separate_cpu_cb"> ++ <property name="toolTip"> ++ <string>Separate samples for each shared library and kernel samples. This increases the time and space overhead of OProfile.</string> ++ </property> ++ <property name="text"> ++ <string>Per-CPU profiles</string> ++ </property> ++ </widget> ++ </item> ++ <item> ++ <widget class="QCheckBox" name="separate_thread_cb"> ++ <property name="toolTip"> ++ <string>Separate samples for each shared library and kernel samples. This increases the time and space overhead of OProfile.</string> ++ </property> ++ <property name="text"> ++ <string>Per-thread/task profiles</string> ++ </property> ++ </widget> ++ </item> ++ <item> ++ <layout class="QHBoxLayout"> ++ <property name="spacing"> ++ <number>6</number> ++ </property> ++ <property name="margin"> ++ <number>0</number> ++ </property> ++ <item> ++ <widget class="QLabel" name="callgraph_depth_label"> ++ <property name="text"> ++ <string>callgraph depth, zero to disable</string> ++ </property> ++ <property name="wordWrap"> ++ <bool>false</bool> ++ </property> ++ <property name="buddy"> ++ <cstring>callgraph_depth_edit</cstring> ++ </property> ++ </widget> ++ </item> ++ <item> ++ <widget class="QLineEdit" name="callgraph_depth_edit"/> ++ </item> ++ </layout> ++ </item> ++ </layout> ++ </item> ++ <item row="0" column="1"> ++ <spacer name="Spacer12"> ++ <property name="orientation"> ++ <enum>Qt::Horizontal</enum> ++ </property> ++ <property name="sizeType"> ++ <enum>QSizePolicy::Expanding</enum> ++ </property> ++ <property name="sizeHint" stdset="0"> ++ <size> ++ <width>20</width> ++ <height>20</height> ++ </size> ++ </property> ++ </spacer> ++ </item> ++ </layout> ++ </item> ++ <item> ++ <spacer name="Spacer9"> ++ <property name="orientation"> ++ <enum>Qt::Vertical</enum> ++ </property> ++ <property name="sizeType"> ++ <enum>QSizePolicy::Expanding</enum> ++ </property> ++ <property name="sizeHint" stdset="0"> ++ <size> ++ <width>20</width> ++ <height>20</height> ++ </size> ++ </property> ++ </spacer> ++ </item> ++ </layout> ++ </widget> ++ </widget> ++ </item> ++ <item> ++ <widget class="QLabel" name="daemon_label"> ++ <property name="toolTip"> ++ <string>Current daemon status</string> ++ </property> ++ <property name="frameShape"> ++ <enum>QFrame::Panel</enum> ++ </property> ++ <property name="frameShadow"> ++ <enum>QFrame::Sunken</enum> ++ </property> ++ <property name="text"> ++ <string/> ++ </property> ++ <property name="wordWrap"> ++ <bool>false</bool> ++ </property> ++ </widget> ++ </item> ++ <item> ++ <layout class="QHBoxLayout"> ++ <property name="spacing"> ++ <number>6</number> ++ </property> ++ <property name="margin"> ++ <number>0</number> ++ </property> ++ <item> ++ <widget class="QPushButton" name="start_profiler_btn"> ++ <property name="text"> ++ <string>St&art</string> ++ </property> ++ </widget> ++ </item> ++ <item> ++ <widget class="QPushButton" name="flush_profiler_data_btn"> ++ <property name="text"> ++ <string>&Flush</string> ++ </property> ++ </widget> ++ </item> ++ <item> ++ <widget class="QPushButton" name="stop_profiler_btn"> ++ <property name="text"> ++ <string>Stop</string> ++ </property> ++ </widget> ++ </item> ++ <item> ++ <spacer name="Spacer5"> ++ <property name="orientation"> ++ <enum>Qt::Horizontal</enum> ++ </property> ++ <property name="sizeType"> ++ <enum>QSizePolicy::Expanding</enum> ++ </property> ++ <property name="sizeHint" stdset="0"> ++ <size> ++ <width>20</width> ++ <height>20</height> ++ </size> ++ </property> ++ </spacer> ++ </item> ++ <item> ++ <widget class="QPushButton" name="reset_sample_files_btn"> ++ <property name="text"> ++ <string>Reset sample files</string> ++ </property> ++ </widget> ++ </item> ++ <item> ++ <widget class="QPushButton" name="quit_and_save_btn"> ++ <property name="text"> ++ <string>Save and &quit</string> ++ </property> ++ <property name="autoDefault"> ++ <bool>true</bool> ++ </property> ++ </widget> ++ </item> ++ </layout> ++ </item> ++ </layout> ++ </widget> ++ <pixmapfunction>qPixmapFromMimeSource</pixmapfunction> ++ <customwidgets> ++ <customwidget> ++ <class>Q3GroupBox</class> ++ <extends>QGroupBox</extends> ++ <header>Qt3Support/Q3GroupBox</header> ++ <container>1</container> ++ </customwidget> ++ <customwidget> ++ <class>Q3Frame</class> ++ <extends>QFrame</extends> ++ <header>Qt3Support/Q3Frame</header> ++ <container>1</container> ++ </customwidget> ++ <customwidget> ++ <class>Q3ButtonGroup</class> ++ <extends>Q3GroupBox</extends> ++ <header>Qt3Support/Q3ButtonGroup</header> ++ <container>1</container> ++ </customwidget> ++ <customwidget> ++ <class>Q3ListView</class> ++ <extends>Q3Frame</extends> ++ <header>q3listview.h</header> ++ </customwidget> ++ </customwidgets> ++ <tabstops> ++ <tabstop>setup_config_tab</tabstop> ++ <tabstop>events_list</tabstop> ++ <tabstop>os_ring_count_cb</tabstop> ++ <tabstop>user_ring_count_cb</tabstop> ++ <tabstop>event_count_edit</tabstop> ++ <tabstop>check0</tabstop> ++ <tabstop>check1</tabstop> ++ <tabstop>check2</tabstop> ++ <tabstop>check3</tabstop> ++ <tabstop>check4</tabstop> ++ <tabstop>check5</tabstop> ++ <tabstop>check6</tabstop> ++ <tabstop>check7</tabstop> ++ <tabstop>check8</tabstop> ++ <tabstop>check9</tabstop> ++ <tabstop>check10</tabstop> ++ <tabstop>check11</tabstop> ++ <tabstop>check12</tabstop> ++ <tabstop>check13</tabstop> ++ <tabstop>check14</tabstop> ++ <tabstop>check15</tabstop> ++ <tabstop>start_profiler_btn</tabstop> ++ <tabstop>flush_profiler_data_btn</tabstop> ++ <tabstop>stop_profiler_btn</tabstop> ++ <tabstop>reset_sample_files_btn</tabstop> ++ <tabstop>quit_and_save_btn</tabstop> ++ <tabstop>kernel_filename_edit</tabstop> ++ <tabstop>no_vmlinux</tabstop> ++ <tabstop>buffer_size_edit</tabstop> ++ <tabstop>note_table_size_edit</tabstop> ++ <tabstop>buffer_watershed_edit</tabstop> ++ <tabstop>verbose</tabstop> ++ <tabstop>separate_lib_cb</tabstop> ++ <tabstop>separate_kernel_cb</tabstop> ++ <tabstop>separate_cpu_cb</tabstop> ++ <tabstop>separate_thread_cb</tabstop> ++ <tabstop>callgraph_depth_edit</tabstop> ++ </tabstops> ++ <resources/> ++ <connections> ++ <connection> ++ <sender>start_profiler_btn</sender> ++ <signal>clicked(bool)</signal> ++ <receiver>oprof_start_base</receiver> ++ <slot>start_profiler()</slot> ++ <hints> ++ <hint type="sourcelabel"> ++ <x>20</x> ++ <y>20</y> ++ </hint> ++ <hint type="destinationlabel"> ++ <x>20</x> ++ <y>20</y> ++ </hint> ++ </hints> ++ </connection> ++ <connection> ++ <sender>stop_profiler_btn</sender> ++ <signal>clicked(bool)</signal> ++ <receiver>oprof_start_base</receiver> ++ <slot>stop_profiler()</slot> ++ <hints> ++ <hint type="sourcelabel"> ++ <x>20</x> ++ <y>20</y> ++ </hint> ++ <hint type="destinationlabel"> ++ <x>20</x> ++ <y>20</y> ++ </hint> ++ </hints> ++ </connection> ++ <connection> ++ <sender>flush_profiler_data_btn</sender> ++ <signal>clicked(bool)</signal> ++ <receiver>oprof_start_base</receiver> ++ <slot>flush_profiler_data()</slot> ++ <hints> ++ <hint type="sourcelabel"> ++ <x>20</x> ++ <y>20</y> ++ </hint> ++ <hint type="destinationlabel"> ++ <x>20</x> ++ <y>20</y> ++ </hint> ++ </hints> ++ </connection> ++ <connection> ++ <sender>quit_and_save_btn</sender> ++ <signal>clicked(bool)</signal> ++ <receiver>oprof_start_base</receiver> ++ <slot>accept()</slot> ++ <hints> ++ <hint type="sourcelabel"> ++ <x>20</x> ++ <y>20</y> ++ </hint> ++ <hint type="destinationlabel"> ++ <x>20</x> ++ <y>20</y> ++ </hint> ++ </hints> ++ </connection> ++ <connection> ++ <sender>kernel_filename_tb</sender> ++ <signal>clicked(bool)</signal> ++ <receiver>oprof_start_base</receiver> ++ <slot>choose_kernel_filename()</slot> ++ <hints> ++ <hint type="sourcelabel"> ++ <x>20</x> ++ <y>20</y> ++ </hint> ++ <hint type="destinationlabel"> ++ <x>20</x> ++ <y>20</y> ++ </hint> ++ </hints> ++ </connection> ++ <connection> ++ <sender>no_vmlinux</sender> ++ <signal>toggled(bool)</signal> ++ <receiver>kernel_filename_tb</receiver> ++ <slot>setDisabled(bool)</slot> ++ <hints> ++ <hint type="sourcelabel"> ++ <x>20</x> ++ <y>20</y> ++ </hint> ++ <hint type="destinationlabel"> ++ <x>20</x> ++ <y>20</y> ++ </hint> ++ </hints> ++ </connection> ++ <connection> ++ <sender>no_vmlinux</sender> ++ <signal>toggled(bool)</signal> ++ <receiver>kernel_filename_edit</receiver> ++ <slot>setDisabled(bool)</slot> ++ <hints> ++ <hint type="sourcelabel"> ++ <x>20</x> ++ <y>20</y> ++ </hint> ++ <hint type="destinationlabel"> ++ <x>20</x> ++ <y>20</y> ++ </hint> ++ </hints> ++ </connection> ++ <connection> ++ <sender>no_vmlinux</sender> ++ <signal>toggled(bool)</signal> ++ <receiver>TextLabel1</receiver> ++ <slot>setDisabled(bool)</slot> ++ <hints> ++ <hint type="sourcelabel"> ++ <x>20</x> ++ <y>20</y> ++ </hint> ++ <hint type="destinationlabel"> ++ <x>20</x> ++ <y>20</y> ++ </hint> ++ </hints> ++ </connection> ++ <connection> ++ <sender>separate_kernel_cb</sender> ++ <signal>stateChanged(int)</signal> ++ <receiver>oprof_start_base</receiver> ++ <slot>separate_kernel_cb_changed(int)</slot> ++ <hints> ++ <hint type="sourcelabel"> ++ <x>20</x> ++ <y>20</y> ++ </hint> ++ <hint type="destinationlabel"> ++ <x>20</x> ++ <y>20</y> ++ </hint> ++ </hints> ++ </connection> ++ <connection> ++ <sender>reset_sample_files_btn</sender> ++ <signal>clicked(bool)</signal> ++ <receiver>oprof_start_base</receiver> ++ <slot>reset_sample_files()</slot> ++ <hints> ++ <hint type="sourcelabel"> ++ <x>20</x> ++ <y>20</y> ++ </hint> ++ <hint type="destinationlabel"> ++ <x>20</x> ++ <y>20</y> ++ </hint> ++ </hints> ++ </connection> ++ <connection> ++ <sender>events_list</sender> ++ <signal>selectionChanged()</signal> ++ <receiver>oprof_start_base</receiver> ++ <slot>event_selected()</slot> ++ <hints> ++ <hint type="sourcelabel"> ++ <x>20</x> ++ <y>20</y> ++ </hint> ++ <hint type="destinationlabel"> ++ <x>20</x> ++ <y>20</y> ++ </hint> ++ </hints> ++ </connection> ++ <connection> ++ <sender>events_list</sender> ++ <signal>currentChanged(Q3ListViewItem*)</signal> ++ <receiver>oprof_start_base</receiver> ++ <slot>event_over(Q3ListViewItem*)</slot> ++ <hints> ++ <hint type="sourcelabel"> ++ <x>20</x> ++ <y>20</y> ++ </hint> ++ <hint type="destinationlabel"> ++ <x>20</x> ++ <y>20</y> ++ </hint> ++ </hints> ++ </connection> ++ <connection> ++ <sender>events_list</sender> ++ <signal>onItem(Q3ListViewItem*)</signal> ++ <receiver>oprof_start_base</receiver> ++ <slot>event_over(Q3ListViewItem*)</slot> ++ <hints> ++ <hint type="sourcelabel"> ++ <x>20</x> ++ <y>20</y> ++ </hint> ++ <hint type="destinationlabel"> ++ <x>20</x> ++ <y>20</y> ++ </hint> ++ </hints> ++ </connection> ++ </connections> ++</ui> +diff --git a/m4/qt.m4 b/m4/qt.m4 +deleted file mode 100644 +index b0e30ef..0000000 +--- a/m4/qt.m4 ++++ /dev/null +@@ -1,217 +0,0 @@ +-dnl find a binary in the path +-AC_DEFUN([QT_FIND_PATH], +-[ +- AC_MSG_CHECKING([for $1]) +- AC_CACHE_VAL(qt_cv_path_$1, +- [ +- qt_cv_path_$1="NONE" +- if test -n "$$2"; then +- qt_cv_path_$1="$$2"; +- else +- dirs="$3" +- qt_save_IFS=$IFS +- IFS=':' +- for dir in $PATH; do +- dirs="$dirs $dir" +- done +- IFS=$qt_save_IFS +- +- for dir in $dirs; do +- if test -x "$dir/$1"; then +- if test -n "$5"; then +- evalstr="$dir/$1 $5 2>&1 " +- if eval $evalstr; then +- qt_cv_path_$1="$dir/$1" +- break +- fi +- else +- qt_cv_path_$1="$dir/$1" +- break +- fi +- fi +- done +- fi +- ]) +- +- if test -z "$qt_cv_path_$1" || test "$qt_cv_path_$1" = "NONE"; then +- AC_MSG_RESULT(not found) +- $4 +- else +- AC_MSG_RESULT($qt_cv_path_$1) +- $2=$qt_cv_path_$1 +- fi +-]) +- +-dnl Find the uic compiler on the path or in qt_cv_dir +-AC_DEFUN([QT_FIND_UIC], +-[ +- QT_FIND_PATH(uic, ac_uic, $qt_cv_dir/bin) +- if test -z "$ac_uic" -a "$FATAL" = 1; then +- AC_MSG_ERROR([uic binary not found in \$PATH or $qt_cv_dir/bin !]) +- fi +-]) +- +-dnl Find the right moc in path/qt_cv_dir +-AC_DEFUN([QT_FIND_MOC], +-[ +- QT_FIND_PATH(moc2, ac_moc2, $qt_cv_dir/bin) +- QT_FIND_PATH(moc, ac_moc1, $qt_cv_dir/bin) +- +- if test -n "$ac_moc1" -a -n "$ac_moc2"; then +- dnl found both. Prefer Qt3's if it exists else moc2 +- $ac_moc1 -v 2>&1 | grep "Qt 3" >/dev/null +- if test "$?" = 0; then +- ac_moc=$ac_moc1; +- else +- ac_moc=$ac_moc2; +- fi +- else +- if test -n "$ac_moc1"; then +- ac_moc=$ac_moc1; +- else +- ac_moc=$ac_moc2; +- fi +- fi +- +- if test -z "$ac_moc" -a "$FATAL" = 1; then +- AC_MSG_ERROR([moc binary not found in \$PATH or $qt_cv_dir/bin !]) +- fi +-]) +- +-dnl check a particular libname +-AC_DEFUN([QT_TRY_LINK], +-[ +- SAVE_LIBS="$LIBS" +- LIBS="$LIBS $1" +- AC_TRY_LINK([ +- #include <qglobal.h> +- #include <qstring.h> +- ], +- [ +- QString s("mangle_failure"); +- #if (QT_VERSION < 221) +- break_me_(\\\); +- #endif +- ], +- qt_cv_libname=$1, +- ) +- LIBS="$SAVE_LIBS" +-]) +- +-dnl check we can do a compile +-AC_DEFUN([QT_CHECK_COMPILE], +-[ +- AC_MSG_CHECKING([for Qt library name]) +- +- AC_CACHE_VAL(qt_cv_libname, +- [ +- AC_LANG_CPLUSPLUS +- SAVE_CXXFLAGS=$CXXFLAGS +- CXXFLAGS="$CXXFLAGS $QT_INCLUDES $QT_LDFLAGS" +- +- for libname in -lqt-mt -lqt3 -lqt2 -lqt; +- do +- QT_TRY_LINK($libname) +- if test -n "$qt_cv_libname"; then +- break; +- fi +- done +- +- CXXFLAGS=$SAVE_CXXFLAGS +- ]) +- +- if test -z "$qt_cv_libname"; then +- AC_MSG_RESULT([failed]) +- if test "$FATAL" = 1 ; then +- AC_MSG_ERROR([Cannot compile a simple Qt executable. Check you have the right \$QTDIR !]) +- fi +- else +- AC_MSG_RESULT([$qt_cv_libname]) +- fi +-]) +- +-dnl get Qt version we're using +-AC_DEFUN([QT_GET_VERSION], +-[ +- AC_CACHE_CHECK([Qt version],lyx_cv_qtversion, +- [ +- AC_LANG_CPLUSPLUS +- SAVE_CPPFLAGS=$CPPFLAGS +- CPPFLAGS="$CPPFLAGS $QT_INCLUDES" +- +- cat > conftest.$ac_ext <<EOF +-#line __oline__ "configure" +-#include "confdefs.h" +-#include <qglobal.h> +-"%%%"QT_VERSION_STR"%%%" +-EOF +- lyx_cv_qtversion=`(eval "$ac_cpp conftest.$ac_ext") 2>&5 | \ +- grep '^"%%%"' 2>/dev/null | \ +- sed -e 's/"%%%"//g' -e 's/"//g'` +- rm -f conftest.$ac_ext +- CPPFLAGS=$SAVE_CPPFLAGS +- ]) +- +- QT_VERSION=$lyx_cv_qtversion +- AC_SUBST(QT_VERSION) +-]) +- +-dnl start here +-AC_DEFUN([QT_DO_IT_ALL], +-[ +- dnl Please leave this alone. I use this file in +- dnl oprofile. +- FATAL=0 +- +- AC_ARG_WITH(qt-dir, [ --with-qt-dir where the root of Qt is installed ], +- [ qt_cv_dir=`eval echo "$withval"/` ]) +- +- AC_ARG_WITH(qt-includes, [ --with-qt-includes where the Qt includes are. ], +- [ qt_cv_includes=`eval echo "$withval"` ]) +- +- AC_ARG_WITH(qt-libraries, [ --with-qt-libraries where the Qt library is installed.], +- [ qt_cv_libraries=`eval echo "$withval"` ]) +- +- dnl pay attention to $QTDIR unless overridden +- if test -z "$qt_cv_dir"; then +- qt_cv_dir=$QTDIR +- fi +- +- dnl derive inc/lib if needed +- if test -n "$qt_cv_dir"; then +- if test -z "$qt_cv_includes"; then +- qt_cv_includes=$qt_cv_dir/include +- fi +- if test -z "$qt_cv_libraries"; then +- qt_cv_libraries=$qt_cv_dir/lib +- fi +- fi +- +- dnl flags for compilation +- QT_INCLUDES= +- QT_LDFLAGS= +- if test -n "$qt_cv_includes"; then +- QT_INCLUDES="-isystem $qt_cv_includes" +- fi +- if test -n "$qt_cv_libraries"; then +- QT_LDFLAGS="-L$qt_cv_libraries" +- fi +- AC_SUBST(QT_INCLUDES) +- AC_SUBST(QT_LDFLAGS) +- +- QT_FIND_MOC +- MOC=$ac_moc +- AC_SUBST(MOC) +- QT_FIND_UIC +- UIC=$ac_uic +- AC_SUBST(UIC) +- +- QT_CHECK_COMPILE +- +- QT_LIB=$qt_cv_libname; +- AC_SUBST(QT_LIB) +- +- if test -n "$qt_cv_libname"; then +- QT_GET_VERSION +- fi +-]) +diff --git a/m4/qt4.m4 b/m4/qt4.m4 +new file mode 100644 +index 0000000..0df96f7 +--- /dev/null ++++ b/m4/qt4.m4 +@@ -0,0 +1,211 @@ ++dnl check a particular libname ++AC_DEFUN([QT4_TRY_LINK], ++[ ++ SAVE_LIBS="$LIBS" ++ LIBS="$LIBS $1" ++ AC_TRY_LINK([ ++ #include <qglobal.h> ++ #include <qstring.h> ++ ], ++ [ ++ QString s("mangle_failure"); ++ #if (QT_VERSION < 400) ++ break_me_(\\\); ++ #endif ++ ], ++ qt4_cv_libname=$1, ++ ) ++ LIBS="$SAVE_LIBS" ++]) ++ ++dnl check we can do a compile ++AC_DEFUN([QT4_CHECK_COMPILE], ++[ ++ AC_MSG_CHECKING([for Qt 4 library name]) ++ ++ AC_CACHE_VAL(qt4_cv_libname, ++ [ ++ AC_LANG_CPLUSPLUS ++ SAVE_CXXFLAGS=$CXXFLAGS ++ CXXFLAGS="$CXXFLAGS $QT4_INCLUDES $QT4_LDFLAGS" ++ for libname in -lQtCore -lQtCore4 ++ do ++ QT4_TRY_LINK($libname) ++ if test -n "$qt4_cv_libname"; then ++ QT4_CORE_LIB="$qt4_cv_libname" ++ break; ++ fi ++ done ++ qt4_cv_libname= ++ for libname in '-lQtCore -lQtGui' \ ++ '-lQtCore4 -lQtGui4' ++ do ++ QT4_TRY_LINK($libname) ++ if test -n "$qt4_cv_libname"; then ++ break; ++ fi ++ done ++ CXXFLAGS=$SAVE_CXXFLAGS ++ ]) ++ ++ if test -z "$qt4_cv_libname"; then ++ AC_MSG_RESULT([failed]) ++ if test "$FATAL" = 1 ; then ++ AC_MSG_ERROR([Cannot compile a simple Qt 4 executable. Check you have the right \$QT4DIR !]) ++ fi ++ else ++ AC_MSG_RESULT([$qt4_cv_libname]) ++ fi ++]) ++ ++dnl get Qt version we're using ++AC_DEFUN([QT4_GET_VERSION], ++[ ++ AC_CACHE_CHECK([Qt 4 version],lyx_cv_qt4version, ++ [ ++ AC_LANG_CPLUSPLUS ++ SAVE_CPPFLAGS=$CPPFLAGS ++ CPPFLAGS="$CPPFLAGS $QT4_INCLUDES" ++ ++ cat > conftest.$ac_ext <<EOF ++#line __oline__ "configure" ++#include "confdefs.h" ++#include <qglobal.h> ++"%%%"QT_VERSION_STR"%%%" ++EOF ++ lyx_cv_qt4version=`(eval "$ac_cpp conftest.$ac_ext") 2>&5 | \ ++ grep '^"%%%"' 2>/dev/null | \ ++ sed -e 's/"%%%"//g' -e 's/"//g'` ++ rm -f conftest.$ac_ext ++ CPPFLAGS=$SAVE_CPPFLAGS ++ ]) ++ ++ QT4_VERSION=$lyx_cv_qt4version ++ AC_SUBST(QT4_VERSION) ++]) ++ ++dnl start here ++AC_DEFUN([QT4_DO_IT_ALL], ++[ ++ dnl this variable is precious ++ AC_ARG_VAR(QT4DIR, [the place where the Qt 4 files are, e.g. /usr/lib/qt4]) ++ ++ dnl Please leave this alone. I use this file in ++ dnl oprofile. ++ FATAL=0 ++ ++ AC_ARG_WITH(qt4-dir, [ --with-qt4-dir where the root of Qt 4 is installed ], ++ [ qt4_cv_dir=`eval echo "$withval"/` ]) ++ ++ AC_ARG_WITH(qt4-includes, [ --with-qt4-includes where the Qt 4 includes are. ], ++ [ qt4_cv_includes=`eval echo "$withval"` ]) ++ ++ AC_ARG_WITH(qt4-libraries, [ --with-qt4-libraries where the Qt 4 library is installed.], ++ [ qt4_cv_libraries=`eval echo "$withval"` ]) ++ ++ dnl pay attention to $QT4DIR unless overridden ++ if test -z "$qt4_cv_dir"; then ++ qt4_cv_dir=$QT4DIR ++ fi ++ ++ dnl derive inc/lib if needed ++ if test -n "$qt4_cv_dir"; then ++ if test -z "$qt4_cv_includes"; then ++ qt4_cv_includes=$qt4_cv_dir/include ++ fi ++ if test -z "$qt4_cv_libraries"; then ++ qt4_cv_libraries=$qt4_cv_dir/lib ++ fi ++ fi ++ ++ dnl compute the binary dir too ++ if test -n "$qt4_cv_dir"; then ++ qt4_cv_bin=$qt4_cv_dir/bin ++ fi ++ ++ dnl Preprocessor flags ++ QT4_CPPFLAGS="-DQT_NO_STL -DQT_NO_KEYWORDS" ++ case ${host} in ++ *mingw*) QT4_CPPFLAGS="-DQT_DLL $QT4_CPPFLAGS";; ++ esac ++ AC_SUBST(QT4_CPPFLAGS) ++ ++ dnl Check if it possible to do a pkg-config ++ PKG_PROG_PKG_CONFIG ++ if test -n "$PKG_CONFIG" ; then ++ QT4_DO_PKG_CONFIG ++ fi ++ if test "$pkg_failed" != "no" ; then ++ QT4_DO_MANUAL_CONFIG ++ fi ++ AC_PATH_PROGS(MOC4, [moc-qt4 moc],[],$qt4_cv_bin:$PATH) ++ AC_PATH_PROGS(UIC4, [uic-qt4 uic],[],$qt4_cv_bin:$PATH) ++ AC_PATH_PROGS(RCC4, [rcc-qt4 rcc],[],$qt4_cv_bin:$PATH) ++]) ++ ++AC_DEFUN([QT4_DO_PKG_CONFIG], ++[ ++ dnl tell pkg-config to look also in $qt4_cv_dir/lib. ++ save_PKG_CONFIG_PATH=$PKG_CONFIG_PATH ++ if test -n "$qt4_cv_dir" ; then ++ PKG_CONFIG_PATH=$qt4_cv_dir/lib:$qt4_cv_dir/lib/pkgconfig:$PKG_CONFIG_PATH ++ export PKG_CONFIG_PATH ++ fi ++ PKG_CHECK_MODULES(QT4_CORE, QtCore,,[:]) ++ if test "$pkg_failed" = "no" ; then ++ QT4_CORE_INCLUDES=$QT4_CORE_CFLAGS ++ AC_SUBST(QT4_CORE_INCLUDES) ++ QT4_CORE_LDFLAGS=`$PKG_CONFIG --libs-only-L QtCore` ++ AC_SUBST(QT4_CORE_LDFLAGS) ++ QT4_CORE_LIB=`$PKG_CONFIG --libs-only-l QtCore` ++ AC_SUBST(QT4_CORE_LIB) ++ fi ++ PKG_CHECK_MODULES(QT4_FRONTEND, QtCore QtGui,,[:]) ++ if test "$pkg_failed" = "no" ; then ++ QT4_INCLUDES=$QT4_FRONTEND_CFLAGS ++ dnl QT4_LDFLAGS=$QT4_FRONTEND_LIBS ++ QT4_LDFLAGS=`$PKG_CONFIG --libs-only-L QtCore QtGui` ++ AC_SUBST(QT4_INCLUDES) ++ AC_SUBST(QT4_LDFLAGS) ++ QT4_VERSION=`$PKG_CONFIG --modversion QtCore` ++ AC_SUBST(QT4_VERSION) ++ QT4_LIB=`$PKG_CONFIG --libs-only-l QtCore QtGui` ++ AC_SUBST(QT4_LIB) ++ LIBS="$LIBS `$PKG_CONFIG --libs-only-other QtCore QtGui`" ++ fi ++ PKG_CONFIG_PATH=$save_PKG_CONFIG_PATH ++]) ++ ++AC_DEFUN([QT4_DO_MANUAL_CONFIG], ++[ ++ dnl flags for compilation ++ QT4_INCLUDES= ++ QT4_LDFLAGS= ++ QT4_CORE_INCLUDES= ++ QT4_CORE_LDFLAGS= ++ if test -n "$qt4_cv_includes"; then ++ QT4_INCLUDES="-I$qt4_cv_includes" ++ for i in Qt QtCore QtGui; do ++ QT4_INCLUDES="$QT4_INCLUDES -I$qt4_cv_includes/$i" ++ done ++ QT4_CORE_INCLUDES="-I$qt4_cv_includes -I$qt4_cv_includes/QtCore" ++ fi ++ if test -n "$qt4_cv_libraries"; then ++ QT4_LDFLAGS="-L$qt4_cv_libraries" ++ QT4_CORE_LDFLAGS="-L$qt4_cv_libraries" ++ fi ++ AC_SUBST(QT4_INCLUDES) ++ AC_SUBST(QT4_CORE_INCLUDES) ++ AC_SUBST(QT4_LDFLAGS) ++ AC_SUBST(QT4_CORE_LDFLAGS) ++ ++ QT4_CHECK_COMPILE ++ ++ QT4_LIB=$qt4_cv_libname; ++ AC_SUBST(QT4_LIB) ++ AC_SUBST(QT4_CORE_LIB) ++ ++ if test -n "$qt4_cv_libname"; then ++ QT4_GET_VERSION ++ fi ++]) diff --git a/source/d/perl/perl.SlackBuild b/source/d/perl/perl.SlackBuild index 9aa963d6a..a58d8a7ed 100755 --- a/source/d/perl/perl.SlackBuild +++ b/source/d/perl/perl.SlackBuild @@ -24,22 +24,24 @@ # originally by: David Cantrell <david@slackware.com> # maintained by: <volkerdi@slackware.com> -VERSION=5.10.0 +VERSION=5.10.1 # IMPORTANT: also update -Dinc_version_list in ./configure below! ARCH=${ARCH:-x86_64} -BUILD=${BUILD:-2} +BUILD=${BUILD:-1} + +NUMJOBS=${NUMJOBS:--j6} CWD=$(pwd) TMP=${TMP:-/tmp} PKG=$TMP/package-perl # Additional required modules: -DBI=1.607 -DBDMYSQL=4.008 +DBDMYSQL=4.013 +DBI=1.609 +URI=1.40 XMLPARSER=2.36 XMLSIMPLE=2.18 -URI=1.37 if [ "$ARCH" = "i386" ]; then SLKCFLAGS="-O2 -march=i386 -mcpu=i686" @@ -70,7 +72,7 @@ mkdir -p $PKG # Extract the source code: cd $TMP rm -rf perl-$VERSION -tar xvf $CWD/perl-$VERSION.tar.bz2 +tar xvf $CWD/perl-$VERSION.tar.?z* || exit 1 # Change into the source directory: cd perl-$VERSION @@ -115,7 +117,7 @@ fi -Doptimize="$SLKCFLAGS" \ $USE_THREADS \ -Dpager='/usr/bin/less -isr' \ - -Dinc_version_list='5.8.8 5.8.7 5.8.6 5.8.5 5.8.4 5.8.3 5.8.2 5.8.1 5.8.0' \ + -Dinc_version_list='5.10.0 5.8.8 5.8.7 5.8.6 5.8.5 5.8.4 5.8.3 5.8.2 5.8.1 5.8.0' \ -Darchname=$ARCH-linux # Kludge for gcc-4.2.4's needlessly changed output: @@ -125,7 +127,7 @@ cat x2p/makefile | grep -v '\<command-line\>' > foo mv foo x2p/makefile # Build perl -make -j6 || exit 1 +make $NUMJOBS || exit 1 make test # Install perl (needed to build modules): @@ -257,11 +259,26 @@ fi # Insert the slack-desc: mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc -zcat $CWD/doinst.sh.gz | \ - sed -e "s#/lib/#/lib${LIBDIRSUFFIX}/#" | sed -e "s#i486#$ARCH#" \ + + +cat << EOF | sed -e "s#/lib/#/lib${LIBDIRSUFFIX}/#" | sed -e "s#i486#$ARCH#" \ > $PKG/install/doinst.sh +#!/bin/sh +config() { + NEW="\$1" + OLD="\$(dirname \$NEW)/\$(basename \$NEW .new)" + # If there's no config file by that name, mv it over: + if [ ! -r \$OLD ]; then + mv \$NEW \$OLD + elif [ "\$(cat \$OLD | md5sum)" = "\$(cat \$NEW | md5sum)" ]; then # toss the redundant copy + rm \$NEW + fi + # Otherwise, we leave the .new copy for the admin to consider... +} +config usr/lib/perl5/${VERSION}/i486-linux-thread-multi/perllocal.pod.new +EOF # Build the package: cd $PKG -makepkg -l y -c n $TMP/perl-$VERSION-$ARCH-$BUILD.txz +/sbin/makepkg -l y -c n $TMP/perl-$VERSION-$ARCH-$BUILD.txz diff --git a/source/d/python/python.SlackBuild b/source/d/python/python.SlackBuild index 88445fd8d..faa2b2523 100755 --- a/source/d/python/python.SlackBuild +++ b/source/d/python/python.SlackBuild @@ -21,12 +21,21 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -VERSION=${VERSION:-2.6.2} -ARCH=${ARCH:-x86_64} -BUILD=${BUILD:-3} +VERSION=${VERSION:-2.6.4} +BUILD=${BUILD:-1} NUMJOBS=${NUMJOBS:-" -j7 "} +# Automatically determine the architecture we're building on: +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) export ARCH=i486 ;; + arm*) export ARCH=arm ;; + # Unless $ARCH is already set, use uname -m for all other archs: + *) export ARCH=$( uname -m ) ;; + esac +fi + CWD=$(pwd) TMP=${TMP:-/tmp} PKG=$TMP/package-python diff --git a/source/d/rcs/rcs.SlackBuild b/source/d/rcs/rcs.SlackBuild index 4ea46e465..7a3980179 100755 --- a/source/d/rcs/rcs.SlackBuild +++ b/source/d/rcs/rcs.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2008, 2009 Patrick J. Volkerding, Sebeka, Minnesota, USA +# Copyright 2008, 2009, 2010 Patrick J. Volkerding, Sebeka, Minnesota, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -21,15 +21,26 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. VERSION=5.7 -ARCH=${ARCH:-x86_64} BUILD=${BUILD:-2} +# Automatically determine the architecture we're building on: +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) export ARCH=i486 ;; + arm*) export ARCH=arm ;; + # Unless $ARCH is already set, use uname -m for all other archs: + *) export ARCH=$( uname -m ) ;; + esac +fi + if [ "$ARCH" = "i486" ]; then SLKCFLAGS="-O2 -march=i486 -mtune=i686" elif [ "$ARCH" = "s390" ]; then SLKCFLAGS="-O2" elif [ "$ARCH" = "x86_64" ]; then SLKCFLAGS="-O2 -fPIC" +else + SLKCFLAGS="-O2" fi CWD=$(pwd) @@ -48,7 +59,7 @@ echo "| rcs-$VERSION |" echo "+=========+" cd $TMP rm -rf rcs-$VERSION -tar xvf $CWD/rcs-$VERSION.tar.gz | exit 1 +tar xvf $CWD/rcs-$VERSION.tar.gz || exit 1 cd rcs-$VERSION chown -R root:root . diff --git a/source/d/ruby/ruby.SlackBuild b/source/d/ruby/ruby.SlackBuild index 96234b8ff..0ff662102 100755 --- a/source/d/ruby/ruby.SlackBuild +++ b/source/d/ruby/ruby.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2008, 2009 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2008, 2009, 2010 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -21,11 +21,22 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -VERSION=1.8.7-p174 -ARCH=${ARCH:-x86_64} -NUMJOBS=${NUMJOBS:-" -j7 "} +PKGNAM=ruby +VERSION=$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1,2 -d - | rev) BUILD=${BUILD:-1} +# Automatically determine the architecture we're building on: +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) export ARCH=i486 ;; + arm*) export ARCH=arm ;; + # Unless $ARCH is already set, use uname -m for all other archs: + *) export ARCH=$( uname -m ) ;; + esac +fi + +NUMJOBS=${NUMJOBS:-" -j7 "} + CWD=$(pwd) TMP=${TMP:-/tmp} PKG=$TMP/package-ruby @@ -48,10 +59,6 @@ rm -rf ruby-$VERSION tar xvf $CWD/ruby-$VERSION.tar.?z* || exit 1 cd ruby-$VERSION || exit 1 -if [ "$ARCH" = "x86_64" ]; then - zcat $CWD/ruby.x86_64.diff.gz | patch -p1 --verbose || exit 1 -fi - chown -R root:root . find . \ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ @@ -70,20 +77,40 @@ CFLAGS="$SLKCFLAGS" \ --datadir=/usr/share \ --docdir=/usr/doc/ruby-$VERSION \ --enable-shared \ + --enable-pthread \ --enable-install-doc \ - --enable-static \ --build=$ARCH-slackware-linux make $NUMJOBS || make || exit 1 make install DESTDIR=$PKG || exit 1 +# This symlink is needed by things that include ruby/config.h. +( cd $PKG/usr/include/ + if [ ! -e ruby -a -d ruby-*/*-*/ruby ]; then + ln -s ruby-*/*-*/ruby . + fi +) + +# These include files are no longer installed as of ruby-1.9.1, but +# kdebindings will not compile without them. Try to remove these +# from the package later if the situation changes. +mkdir -p $PKG/usr/include/ruby-$(echo $VERSION | cut -f 1 -d -)/ruby +cp -a node.h version.h revision.h \ + $PKG/usr/include/ruby-$(echo $VERSION | cut -f 1 -d -)/ruby + mkdir -p $PKG/usr/doc/ruby-$VERSION cp -a \ - COPYING* *GPL* LEGAL NEWS README* ToDo \ + COPYING* *GPL* ChangeLog LEGAL NEWS README* ToDo \ $PKG/usr/doc/ruby-$VERSION +# The entire ChangeLog is excessive for most users: +cat $PKG/usr/doc/ruby-$VERSION/ChangeLog | head -n 1000 > $PKG/usr/doc/ruby-$VERSION/CL +mv $PKG/usr/doc/ruby-$VERSION/CL $PKG/usr/doc/ruby-$VERSION/ChangeLog + find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null +find $PKG | xargs file | grep -e "current ar archive" \ + | cut -f 1 -d : | xargs strip --strip-debug 2> /dev/null # Compress and if needed symlink the man pages: if [ -d $PKG/usr/man ]; then diff --git a/source/d/ruby/ruby.x86_64.diff b/source/d/ruby/ruby.x86_64.diff deleted file mode 100644 index c557546d7..000000000 --- a/source/d/ruby/ruby.x86_64.diff +++ /dev/null @@ -1,11 +0,0 @@ ---- ruby-1.8.7-p160.orig/mkconfig.rb 2008-06-06 12:39:57.000000000 +0200 -+++ ruby-1.8.7-p160/mkconfig.rb 2009-04-29 20:33:58.000000000 +0200 -@@ -102,7 +102,7 @@ - - drive = File::PATH_SEPARATOR == ';' - --prefix = '/lib/ruby/' + RUBY_VERSION.sub(/\.\d+$/, '') + '/' + RUBY_PLATFORM -+prefix = '/lib64/ruby/' + RUBY_VERSION.sub(/\.\d+$/, '') + '/' + RUBY_PLATFORM - print " TOPDIR = File.dirname(__FILE__).chomp!(#{prefix.dump})\n" - print " DESTDIR = ", (drive ? "TOPDIR && TOPDIR[/\\A[a-z]:/i] || " : ""), "'' unless defined? DESTDIR\n" - print " CONFIG = {}\n" diff --git a/source/d/subversion/slack-desc b/source/d/subversion/slack-desc index 935a52212..af2ef0b61 100644 --- a/source/d/subversion/slack-desc +++ b/source/d/subversion/slack-desc @@ -15,5 +15,5 @@ subversion: systems like CVS, RCS or SCCS. Subversion keeps all the information subversion: to permit extracting previous versions of those files at any time. subversion: subversion: For more information about the Subversion project, visit: -subversion: http://subversion.tigris.org +subversion: http://subversion.apache.org subversion: diff --git a/source/d/subversion/subversion.SlackBuild b/source/d/subversion/subversion.SlackBuild index 87a7114e0..c2b01e83b 100755 --- a/source/d/subversion/subversion.SlackBuild +++ b/source/d/subversion/subversion.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2008, 2009 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2008, 2009, 2010 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -21,11 +21,21 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -VERSION=1.6.4 -ARCH=${ARCH:-x86_64} -NUMJOBS=${NUMJOBS:-" -j7 "} +VERSION=${VERSION:-$(echo subversion-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} BUILD=${BUILD:-1} +# Automatically determine the architecture we're building on: +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) export ARCH=i486 ;; + arm*) export ARCH=arm ;; + # Unless $ARCH is already set, use uname -m for all other archs: + *) export ARCH=$( uname -m ) ;; + esac +fi + +NUMJOBS=${NUMJOBS:-" -j7 "} + if [ "$ARCH" = "i486" ]; then SLKCFLAGS="-O2 -march=i486 -mtune=i686" LIBDIRSUFFIX="" @@ -35,6 +45,9 @@ elif [ "$ARCH" = "s390" ]; then elif [ "$ARCH" = "x86_64" ]; then SLKCFLAGS="-O2 -fPIC" LIBDIRSUFFIX="64" +else + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" fi CWD=$(pwd) @@ -46,7 +59,7 @@ mkdir -p $TMP $PKG cd $TMP rm -rf subversion-$VERSION -tar xvf $CWD/subversion-$VERSION.tar.xz || exit 1 +tar xvf $CWD/subversion-$VERSION.tar.?z* || exit 1 cd subversion-$VERSION || exit 1 chown -R root:root . @@ -115,7 +128,7 @@ rm -rf $PKG/usr/build mkdir -p $PKG/usr/doc/subversion-$VERSION cp -a \ - BUGS CHANGES COMMITTERS COPYING* HACKING INSTALL README TRANSLATING doc \ + BUGS COMMITTERS COPYING* HACKING INSTALL README TRANSLATING doc \ $PKG/usr/doc/subversion-$VERSION # too big && useless for most || if you think not, can be found in the source tarball rm -rf $PKG/usr/doc/subversion-$VERSION/doc/tools @@ -135,20 +148,20 @@ rm -rf $PKG/usr/doc/subversion-$VERSION/doc/tools -exec chmod 644 {} \; ) +# If there's a CHANGES file, installing at least part of the recent history +# is useful, but don't let it get totally out of control: +if [ -r CHANGES ]; then + DOCSDIR=$(echo $PKG/usr/doc/*-$VERSION) + cat CHANGES | head -n 1000 > $DOCSDIR/CHANGES + touch -r CHANGES $DOCSDIR/CHANGES +fi + # This removes our DESTDIR from the packlist filenames, to keep perl's # internal inventories consistent and correct. find $PKG -name .packlist | while read plist ; do - sed -e "s%/share/man%/man%g" \ - -e "s%$PKG%%g" \ - -e "s%\.1$%\.1\.gz%g" \ - -e "s%\.2$%\.2\.gz%g" \ - -e "s%\.3$%\.3\.gz%g" \ - -e "s%\.3pm$%\.3pm\.gz%g" \ - -e "s%\.4$%\.4\.gz%g" \ - -e "s%\.5$%\.5\.gz%g" \ - -e "s%\.6$%\.6\.gz%g" \ - -e "s%\.7$%\.7\.gz%g" \ - -e "s%\.8$%\.8\.gz%g" \ + sed -e "s%$PKG%%g" \ + -e "s%/share/man%/man%g" \ + -re "s%\.([1-9]n?|3pm)$%&.gz%g # extend man filenames for .gz" \ ${plist} > ${plist}.new mv -f ${plist}.new ${plist} done |