diff options
Diffstat (limited to 'source/d')
43 files changed, 1575 insertions, 3723 deletions
diff --git a/source/d/automake/automake.SlackBuild b/source/d/automake/automake.SlackBuild index 55353a40..7f3e3d3c 100755 --- a/source/d/automake/automake.SlackBuild +++ b/source/d/automake/automake.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2008, 2009 Patrick J. Volkerding, Sebeka, Minnesota, USA +# Copyright 2008, 2009, 2012 Patrick J. Volkerding, Sebeka, Minnesota, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -21,9 +21,9 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -VERSION=1.11.1 +VERSION=${VERSION:-$(echo automake-*.tar.xz | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} NUMJOBS=${NUMJOBS:-" -j7 "} -BUILD=${BUILD:-2} +BUILD=${BUILD:-1} # Note: the package is _built_ as 'noarch' # Automatically determine architecture for build & packaging: @@ -44,8 +44,11 @@ mkdir -p $TMP $PKG cd $TMP rm -rf automake-$VERSION -tar xvf $CWD/automake-$VERSION.tar.?z* || exit 1 +tar xvf $CWD/automake-$VERSION.tar.xz || exit 1 cd automake-$VERSION + +zcat $CWD/automake.perl516.prototype.diff.gz | patch -p1 || exit 1 + chown -R root:root . find . \ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ diff --git a/source/d/automake/automake.perl516.prototype.diff b/source/d/automake/automake.perl516.prototype.diff new file mode 100644 index 00000000..e88b0993 --- /dev/null +++ b/source/d/automake/automake.perl516.prototype.diff @@ -0,0 +1,119 @@ +From 6bf58a59a1f3803e57e3f0378aa9344686707b75 Mon Sep 17 00:00:00 2001 +From: Stefano Lattarini <stefano.lattarini@gmail.com> +Date: Mon, 28 May 2012 11:32:03 +0000 +Subject: aclocal: declare function prototypes, do not use '&' in function calls + +This change will also fix automake bug#11543 (from a report by Matt +Burgess). + +* aclocal.in: Declare prototypes for almost all functions early, before +any actual function definition (but omit the prototype for the dynamically +generated '&search' function). Add prototypes to any function definition. +Remove '&' from function invocations (i.e., simply use "func(ARGS..)" +instead of "&func(ARGS...)"). +* THANKS, NEWS: Update. + +Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com> +--- +diff --git a/aclocal.in b/aclocal.in +index dfb851b..e8855d5 100644 +--- a/aclocal.in ++++ b/aclocal.in +@@ -152,8 +152,34 @@ my $erase_me; + + ################################################################ + ++# Prototypes for all subroutines. ++ ++sub unlink_tmp (;$); ++sub xmkdir_p ($); ++sub check_acinclude (); ++sub reset_maps (); ++sub install_file ($$); ++sub list_compare (\@\@); ++sub scan_m4_dirs ($@); ++sub scan_m4_files (); ++sub add_macro ($); ++sub scan_configure_dep ($); ++sub add_file ($); ++sub scan_file ($$$); ++sub strip_redundant_includes (%); ++sub trace_used_macros (); ++sub scan_configure (); ++sub write_aclocal ($@); ++sub usage ($); ++sub version (); ++sub handle_acdir_option ($$); ++sub parse_arguments (); ++sub parse_ACLOCAL_PATH (); ++ ++################################################################ ++ + # Erase temporary file ERASE_ME. Handle signals. +-sub unlink_tmp ++sub unlink_tmp (;$) + { + my ($sig) = @_; + +@@ -350,7 +376,7 @@ sub scan_m4_dirs ($@) + next if $file eq 'aclocal.m4'; + + my $fullfile = File::Spec->canonpath ("$m4dir/$file"); +- &scan_file ($type, $fullfile, 'aclocal'); ++ scan_file ($type, $fullfile, 'aclocal'); + } + closedir (DIR); + } +@@ -361,12 +387,12 @@ sub scan_m4_files () + { + # First, scan configure.ac. It may contain macro definitions, + # or may include other files that define macros. +- &scan_file (FT_USER, $configure_ac, 'aclocal'); ++ scan_file (FT_USER, $configure_ac, 'aclocal'); + + # Then, scan acinclude.m4 if it exists. + if (-f 'acinclude.m4') + { +- &scan_file (FT_USER, 'acinclude.m4', 'aclocal'); ++ scan_file (FT_USER, 'acinclude.m4', 'aclocal'); + } + + # Finally, scan all files in our search paths. +@@ -380,7 +406,7 @@ sub scan_m4_files () + my $search = "sub search {\nmy \$found = 0;\n"; + foreach my $key (reverse sort keys %map) + { +- $search .= ('if (/\b\Q' . $key . '\E(?!\w)/) { & add_macro ("' . $key ++ $search .= ('if (/\b\Q' . $key . '\E(?!\w)/) { add_macro ("' . $key + . '"); $found = 1; }' . "\n"); + } + $search .= "return \$found;\n};\n"; +@@ -403,7 +429,7 @@ sub add_macro ($) + + verb "saw macro $macro"; + $macro_seen{$macro} = 1; +- &add_file ($map{$macro}); ++ add_file ($map{$macro}); + } + + # scan_configure_dep ($file) +@@ -465,7 +491,7 @@ sub scan_configure_dep ($) + } + + add_macro ($_) foreach (@rlist); +- &scan_configure_dep ($_) foreach @ilist; ++ scan_configure_dep ($_) foreach @ilist; + } + + # add_file ($FILE) +@@ -931,7 +957,7 @@ EOF + } + + # Print version and exit. +-sub version() ++sub version () + { + print <<EOF; + aclocal (GNU $PACKAGE) $VERSION +-- +cgit v0.9.0.2 diff --git a/source/d/binutils/binutils-2.21.51.0.6.tar.sign b/source/d/binutils/binutils-2.21.51.0.6.tar.sign deleted file mode 100644 index f5824788..00000000 --- a/source/d/binutils/binutils-2.21.51.0.6.tar.sign +++ /dev/null @@ -1,8 +0,0 @@ ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.11 (GNU/Linux) -Comment: See http://www.kernel.org/signature.html for info - -iD8DBQBNNlEFyGugalF9Dw4RAiCTAJ4iU8QPmGnj/bIA+qXwpNK926m3ywCeMEGE -+3QFy1J7SclHy+sNNX0unSA= -=OHU3 ------END PGP SIGNATURE----- diff --git a/source/d/binutils/binutils-2.22.52.0.2.tar.sign b/source/d/binutils/binutils-2.22.52.0.2.tar.sign Binary files differnew file mode 100644 index 00000000..c2bf9930 --- /dev/null +++ b/source/d/binutils/binutils-2.22.52.0.2.tar.sign diff --git a/source/d/binutils/binutils.SlackBuild b/source/d/binutils/binutils.SlackBuild index a5616ea2..02791dc1 100755 --- a/source/d/binutils/binutils.SlackBuild +++ b/source/d/binutils/binutils.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2005-2010 Patrick J. Volkerding, Sebeka, Minnesota, USA +# Copyright 2005-2012 Patrick J. Volkerding, Sebeka, Minnesota, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -20,18 +20,22 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# Modified 2011 by Eric Hameleers <alien at slackware.com> for ARM port. + PKGNAM=binutils -VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-1} +VERSION=${VERSION:-$(echo $PKGNAM-*.tar.xz | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} +BUILD=${BUILD:-2} # Automatically determine the architecture we're building on: +MARCH=$( uname -m ) if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) export ARCH=i486 ;; - arm*) export ARCH=arm ;; + case "$MARCH" in + i?86) export ARCH=i486 ;; + armv7hl) export ARCH=$MARCH ;; + arm*) export ARCH=arm ;; # Unless $ARCH is already set, use uname -m for all other archs: - *) export ARCH=$( uname -m ) ;; + *) export ARCH=$MARCH ;; esac fi @@ -59,14 +63,30 @@ if [ "$ARCH" = "i486" ]; then # The config option below is currently needed to compile on x86: WERROR="--enable-werror=no" LIBDIRSUFFIX="" +elif [ "$ARCH" = "i686" ]; then + SLKCFLAGS="-O2 -march=i686 -mtune=i686" + # The config option below is currently needed to compile on x86: + WERROR="--enable-werror=no" + LIBDIRSUFFIX="" elif [ "$ARCH" = "s390" ]; then SLKCFLAGS="-O2" LIBDIRSUFFIX="" elif [ "$ARCH" = "x86_64" ]; then SLKCFLAGS="-O2 -fPIC" LIBDIRSUFFIX="64" +elif [ "$ARCH" = "armv7hl" ]; then + SLKCFLAGS="-O2 -march=armv7-a -mfpu=vfpv3-d16" + LIBDIRSUFFIX="" +else + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" fi +case "$ARCH" in + arm*) TARGET=$ARCH-slackware-linux-gnueabi ;; + *) TARGET=$ARCH-slackware-linux ;; +esac + CWD=$(pwd) TMP=${TMP:-/tmp} PKG=$TMP/package-binutils @@ -76,7 +96,8 @@ mkdir -p $TMP $PKG cd $TMP rm -rf binutils-$VERSION -tar xvf $CWD/binutils-$VERSION.tar.?z* || exit 1 +tar xvf $CWD/binutils-$VERSION.tar.xz || \ + tar xvf $CWD/binutils-$VERSION.tar.bz2 || exit 1 cd binutils-$VERSION chown -R root:root . @@ -86,6 +107,11 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; +# End of preparations +if echo "$*" | grep -qw -- --prep ; then + exit 0 +fi + # Build for an x86 glibc2-based Linux system: CFLAGS="$SLKCFLAGS" \ ./configure \ @@ -99,11 +125,11 @@ CFLAGS="$SLKCFLAGS" \ --enable-64-bit-bfd \ --enable-plugins \ --enable-threads \ - --enable-targets=$ARCH-slackware-linux \ + --enable-targets=i386-efi-pe,${TARGET} \ $GOLD \ $NO_INITFINI \ $WERROR \ - --build=$ARCH-slackware-linux \ + --build=$TARGET \ || exit 1 make clean || exit 1 @@ -118,8 +144,8 @@ cp -a include/libiberty.h $PKG/usr/include/libiberty.h ( cd $PKG/usr/man/man1 ; mv strings.1 strings-GNU.1 ) # Move ldscripts to /usr/lib${LIBDIRSUFFIX}, and then put symlinks in place -mv $PKG/usr/${ARCH}-slackware-linux/lib/ldscripts $PKG/usr/lib${LIBDIRSUFFIX} -( cd $PKG/usr/${ARCH}-slackware-linux +mv $PKG/usr/${TARGET}/lib/ldscripts $PKG/usr/lib${LIBDIRSUFFIX} +( cd $PKG/usr/${TARGET} ln -s /usr/lib${LIBDIRSUFFIX}/ldscripts lib/ldscripts for FILE in ar as ld ld.bfd ld.gold nm objcopy objdump ranlib strip ; do if [ -r "/usr/bin/$FILE" ]; then diff --git a/source/d/binutils/release.binutils-2.21.51.0.6 b/source/d/binutils/release.binutils-2.21.51.0.6 deleted file mode 100644 index 38a38474..00000000 --- a/source/d/binutils/release.binutils-2.21.51.0.6 +++ /dev/null @@ -1,257 +0,0 @@ -This is the beta release of binutils 2.21.51.0.6 for Linux, which is -based on binutils 2011 0118 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.21.51.0.3 release, you must remove .ctors/.dtors -section sentinels when building glibc or other C run-time libraries. -Otherwise, you will run into: - -http://sourceware.org/bugzilla/show_bug.cgi?id=12343 - -Starting from the 2.21.51.0.2 release, BFD linker has the working LTO -plugin support. It can be used with GCC 4.5 and above. For GCC 4.5, you -need to configure GCC with --enable-gold to enable LTO plugin support. - -Starting from the 2.21.51.0.2 release, binutils fully supports compressed -debug sections. However, compressed debug section isn't turned on by -default in assembler. I am planning to turn it on for x86 assembler in -the future release, which may lead to the Linux kernel bug messages like - -WARNING: lib/ts_kmp.o (.zdebug_aranges): unexpected non-allocatable section. - -But the resulting kernel works fine. - -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.bfd will be installed as ld. You can use the configure -option, --enable-gold=both/gold to choose gold as the default linker, -ld. IA-32 binary and X64_64 binary tar balls are configured with ---enable-gold=both/ld --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.21.51.0.6 to -hjl.tools@gmail.com - -and - -http://www.sourceware.org/bugzilla/ - -Changes from binutils 2.21.51.0.5: - -1. Update from binutils 2011 0118. -2. Fix x32 (ILP32) support. Renamed assembler option to --x32. It -can create working static and dynamic x32 executables. -3. Add BMI and TBM new instruction support. -4. Fix x86 disassembler to properly display sign-extended byte. -5. Improve IFUNC linker support. PRs 12366/12371. -6. Fix readelf bug on archive. PR 12408. -7. Fix a assembler when compressing empty debug sections. PR 12409. -8. Fix a warning symbol linker bug. PR 12339. -9. Fix a duplicated assert message linker bug. PR 12380. -10. Fix plugin linker build. PR 12391. -11. Fix a plugin linker crash. PR 12364. -12. Improve plugin linker. -13. Improve gold. -14. Improve arm support. -15. Improve mips support. -16. Improve rx support. - -Changes from binutils 2.21.51.0.4: - -1. Update from binutils 2011 0104. -2. Add ILP32 support: - -http://www.kernel.org/pub/linux/devel/binutils/ilp32/abi.pdf - -to Linux/x86-64. -3. Prevent the Linux x86-64 kernel build failure and remove -__ld_compatibility support. PR 12356. -4. Improve gold. -5. Improve Windows support. -6. Improve hppa support. -7. Improve mips support. - -Changes from binutils 2.21.51.0.3: - -1. Update from binutils 2010 1217. -2. Fix the Linux relocatable kernel build. PR 12327. -3. Improve mips support. - -Changes from binutils 2.21.51.0.2: - -1. Update from binutils 2010 1215. -2. Add BFD linker support for placing input .ctors/.dtors sections in -output .init_array/.fini_array section. Add SORT_BY_INIT_PRIORITY. The -benefits are - a. Avoid output .ctors/.dtors section in executables and shared - libraries. - b. Allow mixing input .ctors/.dtors sections with input - .init_array/.fini_array sectiobs. GCC PR 46770. -3. Add BFD linker support for "ld -r" on mixed IR/non-IR objects. Add -the new ELF section type SHT_GNU_OBJECT_ONLY (0x6ffffff8). See - -http://sourceware.org/bugzilla/show_bug.cgi?id=12291 - -4. Update BFD linker to accept -flto and -flto-partition= for GCC LTO -option compatibility. -5. Fix BFD linker to avoid touching uncompressed section content when -relocating DWARF debug sections for errror reporting. -6. Mark .gnu.lto_* sections with SHF_EXCLUDE. -7. Add --target option to ar. -8. Improve gold. -9. Improve AIX support. -10. Improve Windows support. -11. Improve mips support. - -Changes from binutils 2.21.51.0.1: - -1. Update from binutils 2010 1206. -2. Fix BFD and GOLD linker for compressed debug section support. -3. Fix BFD linker plugin support. PR ld/12246, ld/12247, ld/12248, -ld/12277, ld/12288 and ld/12289. -4. Update BFD linker to group .text.exit, text.startup and .text.hot -sections. -5. Fix linker for W_EH_PE_datarel handling. PR ld/12253. -6. Fix array access bug in readelf/elfedit. PR binutils/11742 and -binutils/12235. -7. Support dumping GDB .gdb_index section. -8. Install plugin-api.h. -9. Improve gold. -10. Improve Solaris support. -11. Improve VMS support. -12. Improve Windows support. -13. Improve arm support. -14. Improve bfin support. -15. Improve mips support. -16. Improve s390 support. -17. Improve z80 support. - -Changes from binutils 2.20.51.0.12: - -1. Update from binutils 2010 1110. -2. Fix ld plugin support. PRs lto/46291 and lto/46319. -3. Fix x86 assembler to properly fold _GLOBAL_OFFSET_TABLE_ in Intel -syntax. PR 12186. -4. Update assembler to ensure that group signature symbols have the name -of the group. -5. Avoid unnecessary relaxation in assembler. PR 12049. -6. Update linker NOLOAD processing. -7. Update linker not to include archive members when symbols therein have -already been defined. PR 12001. -8. Change objdump to display compressed section names without 'z'. -9. Improve gold. -10. Improve Solaris support. -11. Improve VMS support. -12. Improve Windows support. -13. Improve arm support. -14. Improve cr16 support. -15. Improve mips support. -16. Improve ppc support. -17. Improve tic6x support. - -The file list: - -1. binutils-2.21.51.0.6.tar.bz2. Source code. -2. binutils-2.21.51.0.6.i686.tar.bz2. IA-32 binary tar ball for RedHat - EL 5. -3. binutils-2.21.51.0.6.ia64.tar.bz2. IA-64 binary tar ball for RedHat - EL 5. -4. binutils-2.21.51.0.6.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 -01/18/2011 diff --git a/source/d/binutils/release.binutils-2.22.52.0.2 b/source/d/binutils/release.binutils-2.22.52.0.2 new file mode 100644 index 00000000..a02ee03e --- /dev/null +++ b/source/d/binutils/release.binutils-2.22.52.0.2 @@ -0,0 +1,508 @@ +This is the beta release of binutils 2.22.52.0.2 for Linux, which is +based on binutils 2012 0424 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.21.51.0.3 release, you must remove .ctors/.dtors +section sentinels when building glibc or other C run-time libraries. +Otherwise, you will run into: + +http://sourceware.org/bugzilla/show_bug.cgi?id=12343 + +Starting from the 2.21.51.0.2 release, BFD linker has the working LTO +plugin support. It can be used with GCC 4.5 and above. For GCC 4.5, you +need to configure GCC with --enable-gold to enable LTO plugin support. + +Starting from the 2.21.51.0.2 release, binutils fully supports compressed +debug sections. However, compressed debug section isn't turned on by +default in assembler. I am planning to turn it on for x86 assembler in +the future release, which may lead to the Linux kernel bug messages like + +WARNING: lib/ts_kmp.o (.zdebug_aranges): unexpected non-allocatable section. + +But the resulting kernel works fine. + +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.bfd will be installed as ld. You can use the configure +option, --enable-gold=both/gold to choose gold as the default linker, +ld. IA-32 binary and X64_64 binary tar balls are configured with +--enable-gold=both/ld --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.22.52.0.2 to +hjl.tools@gmail.com + +and + +http://www.sourceware.org/bugzilla/ + +Changes from binutils 2.22.52.0.1: + +1. Update from binutils 2012 0424. +2. Support Intel HLE and RTM extension. +3. Add NACL support. +4. Fix -Bsymbolic with protected function pointer. PR 13880. +5. Fix an IFUNC regression. PR 13817. +6. Fix x86 NOP fill regression. PR 13675. +7. Fix a linker regression. PR 13991. +8. Fix dangling global hidden symbol in symtab. PR 13621. +9. Fix objcopy, strip and ld for --emit-relocs. PR 13947. +10. Improve gold. +11. Improve mach support. +12. Improve vms support. +13. Improve windows support. +14. Improve arm support. +15. Improve avr support. +16. Improve mips support. +17. Improve ppc support. +18. Improve rx support. +19. Improve s390 support. +20. Improve sh support. +21. Improve sparc support. +22. Improve tile support. + +Changes from binutils 2.22.51.0.1: + +1. Update from binutils 2012 0131. +2. Add x32 support to gold. +3. Support linker arch-depedent fill. PR 13616. +4. Add i386 NACL support to x86 assembler. +5. Add fake zero displacement for .d8 and .d32 suffixes to x86 assembler. +6. Add vmfunc support to x86 assembler/disassembler. +7. Support >2GB archive member. PR 13534. +8. Support R_X86_64_PC32 relocation for PIC on x32. PR 13581. +9. Fix LTO linker with --start-group and archive. PR 12758. +10. Fix linker with --build-id. PR 12451. +11. Improve linker dead code dependency removal on DSO. PR 12772. +12. Improve demangler. +13. Fix elf64-x86-64.c build with GCC 4.7. +14. Avoid linker -z text crash. PR 13468. +15. Avoid readelf crash. PR 13622. +16. Avoid nm crash on --size-sort --no-sort. PR 13593. +17. Fix linker COFF SECREL32 relocation support. PR 13491. +18. Improve gold. +19. Improve mach support. +20. Improve arm support. +21. Improve avr support. +22. Improve hppa support. +23. Improve m68k support. +24. Improve mips support. +25. Improve ppc support. +26. Improve rl78 support. +27. Improve rx support. + +Changes from binutils 2.21.53.0.2: + +1. Update from binutils 2011 1118. +2. Fix ar --plugin on archive with mixed IR/non-IR objects. PR 13298. +3. Preserve the maximum alignment and size for common symbols. PR 13250. +4. Fix LTO linker with -as-needed. PR 13287. +5. Fix --plugin support on thin archive. PR 13257. +6. Fix LTO linker on thin archive. PR 13183. +7. Fix --plugin slim object support on archive. PR 13278. +8. Support LDPR_PREVAILING_DEF_IRONLY_EXP in linker plugin. PR 13229. +9. Don't make make IR symbols dynamic. PR 13244. +10. Fix LTO linker with --as-needed. PR 13201. +11. Properly handle 2 IR symbols with the same comdat key. PR 13066. +12. Keep .debug_types sections with linker garbage collection. PR 13233. +13. Fix -ffunction-sections -Wl,--gc-sections failure with symbol +versioning. PR 13195. +14. Improve linker garbage collection support. PR 13177. +15. Remove symbols hidden by version scripts with --gc-sections. PR 12975. +16. Remove unnecessary GOT relocation created for IFUNC. PR 13178. +17. Move IRELATIVE relocations to the end. PR 13302. +18. Avoid readelf core dump. PR 13219. +19. Check zero address size when dumping DWARF sections. PR 13196. +20. Remove the group section if all members are removed. PR 13180. +21. Support R_X86_64_64 and R_X86_64_RELATIVE64 relocations for x32. +PR 13082. +22. Add Adapteva Epiphany support. +23. Add Renesas RL78 support. +24. Improve gold. +25. Improve mach-o support. +26. Improve alpha support. +27. Improve arm support. +28. Improve hppa support. +29. Improve mips support. +30. Improve ppc support. +31. Improve rx support. +32. Improve sparc support. + +Changes from binutils 2.21.53.0.1: + +1. Update from binutils 2011 0804. +2. Add Intel K1OM support. +3. Allow R_X86_64_64 relocation for x32 and check x32 relocation overflow. +PR ld/13048. +4. Support direct call in x86-64 assembly code. PR gas/13046. +5. Add ia32 Google Native Client support. +6. Add .debug_macro section support. +7. Improve gold. +8. Improve VMS support. +9. Improve arm support. +10. Improve hppa support. +11. Improve mips support. +12. Improve mmix support. +13. Improve ppc support. + +Changes from binutils 2.21.52.0.2: + +1. Update from binutils 2011 0716. +2. Fix LTO linker bugs. PRs 12982/12942. +3. Fix rorx support in x86 assembler/disassembler for AVX Programming +Reference (June, 2011). +4. Fix an x86-64 ELFOSABI linker regression. +5. Update ELFOSABI_GNU support. PR 12913. +6. Fix a linker regression with prelink support. PR 12921. +7. Add unwind info to x86 PLT section. PR 12570. +8. Support x32 core files. +9. Support native x32 linker. +10. Fix linker --gc-sections on note sections. PR 12851. +11. Avoid linker crash on bad input. PR 12887. +12. Add section flags in linker script. +13. Improve elf linker -z option support. +14. Fix nm on compressed debug sections. PR 12983. +15. Fix an ar bug. PR 12558. +16. Fix an ia64 linker regression. PR 12978. +17. Improve gold. +18. Improve VMS support. +19. Add TILE-Gx/TILEPro support. +20. Improve alpha support. +21. Improve avr support. +22. Improve mips support. +23. Improve arm support. +24. Improve ppc support. +25. Improve sh support. +26. Improve TIC6X support. + +Changes from binutils 2.21.52.0.1: + +1. Update from binutils 2011 0610. +2. Support AVX Programming Reference (June, 2011) +3. Allow R_X86_64_64 relocations in SEC_DEBUGGING sections when building +x32 shared libraries. Used to build kernel x32 vDSO. +4. Fix linker --gc-sections on note sections. PR 12851. +5. Update readelf to handle binaries containing corrupt version +information. PR 12855. +6. Improve gold. +7. Improve VMS support. +8. Improve mips support. + +Changes from binutils 2.21.51.0.9: + +1. Update from binutils 2011 0608. +2. Fix an x86 linker regression. PRs 12833/12837/12859. +3. Fix an x86-64 large model TLS linker bug. PR 12809. +4. Fix LTO bugs. PRs 12758/12760. +5. Add a new linker switch, -plugin-save-temps. +6. Fix an linker bug for warning on common symbol in archive. +7. Fix warning support when building shared library. PR 12761. +8. Reduce linker memory usage when linking many small object files. +PR 12682. +9. Fix a thin archive bug. PR 12710. +10. Fix a TLS linker bug. PR 12763. +11. Improve gold. +12. Improve DWARF dump support. +13. Improve XCOFF support. +14. Improve arm support. +15. Improve cris support. +16. Improve ia64 ILP32 support. +17. Improve mips support. +18. Improve ppc support. +19. Improve rx support. +20. Improve s390 support. +21. Improve tic30 support. +22. Improve tic6x support. +23. Improve v850 support. + +Changes from binutils 2.21.51.0.8: + +1. Update from binutils 2011 0507. +2. Improve LTO bfd linker. PRs 12365/12696/12672 +3. Fix a linker regression with constructor attribute in C++. PR 12730. +4. Warn relocation in readonly section when creating a shared object. +5. Remove empty output sections. PR 12718. +6. Remove DT_TEXTREL with local IFUNC symbols. PR 12694. +7. Properly set ELFOSABI_LINUX for STB_GNU_UNIQUE. PR 10549. +8. Fix objcopy on unusual input. PR 12632. +9. Fix an ar regression. PR 12720. +10 Avoid linker crash on bad linker input. +11. Fix a linker script regression. PR 12726. +12. Support new GNU DWARF extensions. +13. Initial support for SystemTap note sections. +14. Add --dwarf-start and --dwarf-end to readelf and objdump. +15. Disable 3dnow and 3dnowa for bdver1 in x86 assembler. +16. Improve gold. +17. Improve VMS support. +18. Improve arm support. +19. Improve mips support. +20. Improve ppc support. +21. Improve s390 support. +22. Improve tic6x support. + +Changes from binutils 2.21.51.0.7: + +1. Update from binutils 2011 0408. +2. Fix x32 TLS linker bug. +3. Enable .quad directive in x32 assembler. +4. Fix an assembler regression. PRs 12569/12589. +5. Add --size-check= assembler option to issue a warning, instead of an +error, on bad ELF .size directive. +6. Fix an ia32 linker bug with TLS/PIE. PR 12654. +7. Fix Intel L1OM linker library search path. +8. Fix a linker buffer overflow on malformed inputs. PR 12613. +9. Check corrupted symtab in nm/readelf. PR 12639. +10. Avoid objcopy crash on archive with unknown objects. PR 12632. +11. Fix "ar -t". PR 12590. +12. Fix many memory leaks. +13. Improve DWARF support. +14. Improve gold. +15. Improve VMS support. +16. Improve Windows support. +17. Improve alpha support. +18. Improve arm support. +19. Improve avr support. +20. Improve ppc support. +21. Improve sparc support. +22. Improve tic6x support. + +Changes from binutils 2.21.51.0.6: + +1. Update from binutils 2011 0306. +2. Supprt x32 TLS IE->LE transition. +3. Change x32 library directory from /lib32 to /libx32. +4. Improve LTO linker support. Fix PRs 12439/12314/12248/12430. +5. Improve linker plugin support. +6. Fix an ar bug. PR 12513. +7. Properly generate nops for ia32. PR 6957. +8. Improve readelf DT_GNU_HASH support. PR 12523. +9. Improve readelf on invalid input. PR 12467. +10. Update ELF assembler to issue an error on invalid .size directive. +PR 12519, +11. Properly handle PT_DYNAMIC segment with zero size sections. PR 12516. +12. Add a new linker option, --verbose=2, to report plugin symbol +status. +13. Properly handle entry symbols in linker LTO support. PR 12507. +14. Improve gold. +15. Improve arm support. +16. Improve bfin support. +17. Improve mips support. +18. Improve ppc support. + +Changes from binutils 2.21.51.0.5: + +1. Update from binutils 2011 0118. +2. Fix x32 (ILP32) support. Renamed assembler option to --x32. It +can create working static and dynamic x32 executables. +3. Add BMI and TBM new instruction support. +4. Fix x86 disassembler to properly display sign-extended byte. +5. Improve IFUNC linker support. PRs 12366/12371. +6. Fix readelf bug on archive. PR 12408. +7. Fix a assembler when compressing empty debug sections. PR 12409. +8. Fix a warning symbol linker bug. PR 12339. +9. Fix a duplicated assert message linker bug. PR 12380. +10. Fix plugin linker build. PR 12391. +11. Fix a plugin linker crash. PR 12364. +12. Improve plugin linker. +13. Improve gold. +14. Improve arm support. +15. Improve mips support. +16. Improve rx support. + +Changes from binutils 2.21.51.0.4: + +1. Update from binutils 2011 0104. +2. Add ILP32 support: + +http://www.kernel.org/pub/linux/devel/binutils/ilp32/abi.pdf + +to Linux/x86-64. +3. Prevent the Linux x86-64 kernel build failure and remove +__ld_compatibility support. PR 12356. +4. Improve gold. +5. Improve Windows support. +6. Improve hppa support. +7. Improve mips support. + +Changes from binutils 2.21.51.0.3: + +1. Update from binutils 2010 1217. +2. Fix the Linux relocatable kernel build. PR 12327. +3. Improve mips support. + +Changes from binutils 2.21.51.0.2: + +1. Update from binutils 2010 1215. +2. Add BFD linker support for placing input .ctors/.dtors sections in +output .init_array/.fini_array section. Add SORT_BY_INIT_PRIORITY. The +benefits are + a. Avoid output .ctors/.dtors section in executables and shared + libraries. + b. Allow mixing input .ctors/.dtors sections with input + .init_array/.fini_array sectiobs. GCC PR 46770. +3. Add BFD linker support for "ld -r" on mixed IR/non-IR objects. Add +the new ELF section type SHT_GNU_OBJECT_ONLY (0x6ffffff8). See + +http://sourceware.org/bugzilla/show_bug.cgi?id=12291 + +4. Update BFD linker to accept -flto and -flto-partition= for GCC LTO +option compatibility. +5. Fix BFD linker to avoid touching uncompressed section content when +relocating DWARF debug sections for errror reporting. +6. Mark .gnu.lto_* sections with SHF_EXCLUDE. +7. Add --target option to ar. +8. Improve gold. +9. Improve AIX support. +10. Improve Windows support. +11. Improve mips support. + +Changes from binutils 2.21.51.0.1: + +1. Update from binutils 2010 1206. +2. Fix BFD and GOLD linker for compressed debug section support. +3. Fix BFD linker plugin support. PR ld/12246, ld/12247, ld/12248, +ld/12277, ld/12288 and ld/12289. +4. Update BFD linker to group .text.exit, text.startup and .text.hot +sections. +5. Fix linker for W_EH_PE_datarel handling. PR ld/12253. +6. Fix array access bug in readelf/elfedit. PR binutils/11742 and +binutils/12235. +7. Support dumping GDB .gdb_index section. +8. Install plugin-api.h. +9. Improve gold. +10. Improve Solaris support. +11. Improve VMS support. +12. Improve Windows support. +13. Improve arm support. +14. Improve bfin support. +15. Improve mips support. +16. Improve s390 support. +17. Improve z80 support. + +Changes from binutils 2.20.51.0.12: + +1. Update from binutils 2010 1110. +2. Fix ld plugin support. PRs lto/46291 and lto/46319. +3. Fix x86 assembler to properly fold _GLOBAL_OFFSET_TABLE_ in Intel +syntax. PR 12186. +4. Update assembler to ensure that group signature symbols have the name +of the group. +5. Avoid unnecessary relaxation in assembler. PR 12049. +6. Update linker NOLOAD processing. +7. Update linker not to include archive members when symbols therein have +already been defined. PR 12001. +8. Change objdump to display compressed section names without 'z'. +9. Improve gold. +10. Improve Solaris support. +11. Improve VMS support. +12. Improve Windows support. +13. Improve arm support. +14. Improve cr16 support. +15. Improve mips support. +16. Improve ppc support. +17. Improve tic6x support. + +The file list: + +1. binutils-2.22.52.0.2.tar.bz2. Source code. + +The primary sites for the beta Linux binutils are: + +1. http://www.kernel.org/pub/linux/devel/binutils/ + +It is also available on linux/release/2.22.52.0.2 branch at + +http://git.kernel.org/?p=linux/kernel/git/hjl/binutils.git;a=summary + +Thanks. + + +H.J. Lu +hjl.tools@gmail.com +04/25/2012 diff --git a/source/d/bison/bison.SlackBuild b/source/d/bison/bison.SlackBuild index b4835eed..d9e4b522 100755 --- a/source/d/bison/bison.SlackBuild +++ b/source/d/bison/bison.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2005-2008, 2009, 2010 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2005-2008, 2009, 2010, 2012 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -23,7 +23,7 @@ PKGNAM=bison VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-2} +BUILD=${BUILD:-1} NUMJOBS=${NUMJOBS:--j6} @@ -60,7 +60,7 @@ mkdir -p $TMP $PKG cd $TMP rm -rf bison-$VERSION -tar xvf $CWD/bison-$VERSION.tar.bz2 || exit 1 +tar xvf $CWD/bison-$VERSION.tar.?z* || exit 1 cd bison-$VERSION || exit 1 chown -R root:root . find . \ @@ -74,7 +74,9 @@ CFLAGS="$SLKCFLAGS" \ --prefix=/usr \ --libdir=/usr/lib${LIBDIRSUFFIX} \ --mandir=/usr/man \ - --infodir=/usr/info + --infodir=/usr/info \ + --docdir=/usr/doc/bison-$VERSION \ + --build=$ARCH-slackware-linux make $NUMJOBS || make || exit 1 make install DESTDIR=$PKG @@ -82,10 +84,23 @@ 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 +# 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 + rm -f $PKG/usr/info/dir gzip -9 $PKG/usr/info/* -gzip -9 $PKG/usr/man/man1/bison.1 -gzip -9 $PKG/usr/man/man1/yacc.1 mkdir -p $PKG/usr/doc/bison-$VERSION cp -a \ diff --git a/source/d/cmake/cmake.SlackBuild b/source/d/cmake/cmake.SlackBuild index e3e1504e..3002e35b 100755 --- a/source/d/cmake/cmake.SlackBuild +++ b/source/d/cmake/cmake.SlackBuild @@ -22,7 +22,7 @@ PKGNAM=cmake VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then @@ -58,6 +58,8 @@ rm -rf $PKGNAM-$VERSION tar xvf $CWD/$PKGNAM-$VERSION.tar.?z* || exit 1 cd $PKGNAM-$VERSION +zcat $CWD/cmake.findpkgconfig.3ea850.patch.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 \) \ @@ -67,7 +69,11 @@ find . \ mkdir cmake-build cd cmake-build -../bootstrap +../bootstrap \ + --prefix=/usr \ + --docdir=/doc/$PKGNAM-$VERSION \ + --qt-gui \ + --system-libs # Build CFLAGS="$SLKCFLAGS" \ diff --git a/source/d/cmake/cmake.findpkgconfig.3ea850.patch b/source/d/cmake/cmake.findpkgconfig.3ea850.patch new file mode 100644 index 00000000..a64e47a7 --- /dev/null +++ b/source/d/cmake/cmake.findpkgconfig.3ea850.patch @@ -0,0 +1,63 @@ +From 3ea850a5023060b84dcc0e6f0098c32c28b15807 Mon Sep 17 00:00:00 2001 +From: Rolf Eike Beer <eike@sf-mail.de> +Date: Fri, 13 Apr 2012 08:50:49 +0200 +Subject: [PATCH] FindPkgConfig.cmake: fix documented output variable not set + (#13125,#13132) + +The real fix is from Yury G. Kudryashov while I added the surrounding cleanups. +An additional hint to really get this fixed came from Rex Dieter. +--- + Modules/FindPkgConfig.cmake | 8 ++++++-- + Tests/CMakeOnly/AllFindModules/CMakeLists.txt | 3 +-- + 2 files changed, 7 insertions(+), 4 deletions(-) + +diff --git a/Modules/FindPkgConfig.cmake b/Modules/FindPkgConfig.cmake +index 5d93ab1..39d3a76 100644 +--- a/Modules/FindPkgConfig.cmake ++++ b/Modules/FindPkgConfig.cmake +@@ -13,11 +13,10 @@ + # When the 'QUIET' argument is set, no status messages will be printed. + # + # It sets the following variables: +-# PKG_CONFIG_FOUND ... true if pkg-config works on the system ++# PKG_CONFIG_FOUND ... if pkg-config executable was found + # PKG_CONFIG_EXECUTABLE ... pathname of the pkg-config program + # PKG_CONFIG_VERSION_STRING ... the version of the pkg-config program found + # (since CMake 2.8.8) +-# PKG_CONFIG_FOUND ... if pkg-config executable was found + # + # For the following variables two sets of values exist; first one is the + # common one and has the given PREFIX. The second set contains flags +@@ -104,6 +103,11 @@ find_package_handle_standard_args(PkgConfig + REQUIRED_VARS PKG_CONFIG_EXECUTABLE + VERSION_VAR PKG_CONFIG_VERSION_STRING) + ++# This is needed because the module name is "PkgConfig" but the name of ++# this variable has always been PKG_CONFIG_FOUND so this isn't automatically ++# handled by FPHSA. ++set(PKG_CONFIG_FOUND "${PKGCONFIG_FOUND}") ++ + # Unsets the given variables + macro(_pkgconfig_unset var) + set(${var} "" CACHE INTERNAL "") +diff --git a/Tests/CMakeOnly/AllFindModules/CMakeLists.txt b/Tests/CMakeOnly/AllFindModules/CMakeLists.txt +index 6604208..fc65e58 100644 +--- a/Tests/CMakeOnly/AllFindModules/CMakeLists.txt ++++ b/Tests/CMakeOnly/AllFindModules/CMakeLists.txt +@@ -71,7 +71,7 @@ endmacro(check_version_string) + # reported. + + foreach(VTEST ALSA ARMADILLO BZIP2 CUPS CURL EXPAT FREETYPE GETTEXT GIT HSPELL +- JASPER LIBXML2 LIBXSLT PERL PostgreSQL TIFF ZLIB) ++ JASPER LIBXML2 LIBXSLT PERL PKG_CONFIG PostgreSQL TIFF ZLIB) + check_version_string(${VTEST} ${VTEST}_VERSION_STRING) + endforeach(VTEST) + +@@ -82,4 +82,3 @@ endforeach(VTEST) + + check_version_string(PYTHONINTERP PYTHON_VERSION_STRING) + check_version_string(SUBVERSION Subversion_VERSION_SVN) +-check_version_string(PKGCONFIG PKG_CONFIG_VERSION_STRING) +-- +1.7.10 + diff --git a/source/d/cmake/slack-desc b/source/d/cmake/slack-desc index 481fdd51..8fb5c8dd 100644 --- a/source/d/cmake/slack-desc +++ b/source/d/cmake/slack-desc @@ -9,7 +9,7 @@ cmake: CMake (cross-platform, open-source make system) cmake: cmake: CMake is used to control the software process using simple platform -cmake: and compiler independed configuration files. CMake generates +cmake: and compiler independent configuration files. CMake generates cmake: native makefiles and workspaces that can be used in the cmake: compiler environment of your choice. cmake: diff --git a/source/d/doxygen/doxygen.SlackBuild b/source/d/doxygen/doxygen.SlackBuild index 97db3b10..2a4a0733 100755 --- a/source/d/doxygen/doxygen.SlackBuild +++ b/source/d/doxygen/doxygen.SlackBuild @@ -107,6 +107,14 @@ cp -a \ INSTALL LANGUAGE.HOWTO LICENSE PLATFORMS README* VERSION \ $PKG/usr/doc/doxygen-$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 + mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc diff --git a/source/d/gcc/antlr-runtime-3.4.jar b/source/d/gcc/antlr-runtime-3.4.jar Binary files differnew file mode 100644 index 00000000..865a537b --- /dev/null +++ b/source/d/gcc/antlr-runtime-3.4.jar diff --git a/source/d/gcc/create_gcj_jvm.sh b/source/d/gcc/create_gcj_jvm.sh new file mode 100644 index 00000000..d1011860 --- /dev/null +++ b/source/d/gcc/create_gcj_jvm.sh @@ -0,0 +1,93 @@ +# --------------------------------------------------------------------------- +# This script creates a directory structure below /usr/lib/jvm and populates +# it with symlinks to GCC binaries. +# This will work as a compatibility layer to emulate an Oracle JDK/JRE. +# This emulation is required in order to compile OpenJDK using GNU java. +# +# The same can automatically be achieved in Slackware's gcc packages if +# the 'configure' command is called with the following additional parameters: +# --enable-java-home \ +# --with-java-home=/usr/lib$LIBDIRSUFFIX/jvm/jre \ +# --with-jvm-root-dir=/usr/lib$LIBDIRSUFFIX/jvm \ +# --with-jvm-jar-dir=/usr/lib$LIBDIRSUFFIX/jvm/jvm-exports \ +# --with-arch-directory=$LIB_ARCH \ +# +# Author: Eric Hameleers <alien@slackware.com> December 2011 +# --------------------------------------------------------------------------- + +# 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="" + LIB_ARCH=i386 +elif [ "$ARCH" = "i686" ]; then + SLKCFLAGS="-O2 -march=i686 -mtune=i686" + LIBDIRSUFFIX="" + LIB_ARCH=i386 +elif [ "$ARCH" = "x86_64" ]; then + SLKCFLAGS="-O2 -fPIC" + LIBDIRSUFFIX="64" + LIB_ARCH=amd64 +else + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" + LIB_ARCH=$ARCH +fi + +# Where does the OpenJDK SlackBuild expect the GNU java compatibility symlinks: +JVM=${1:-/usr/lib${LIBDIRSUFFIX}/jvm} +BINDIR=/usr/bin + +# What version of GCC do we have installed: +GCJVER=$(gcj -dumpversion) + +# First, remove the old set of symlinks if they should exist: +rm -fr $JVM + +# Create a JDK compatible directory structure for GNU java: +mkdir -p $JVM +mkdir -p $JVM/bin +mkdir -p $JVM/jre/bin +mkdir -p $JVM/jre/lib/${LIB_ARCH}/client +mkdir -p $JVM/jre/lib/${LIB_ARCH}/server +mkdir -p $JVM/lib + +ln -sf $BINDIR/gjar $JVM/bin/jar +ln -sf $BINDIR/grmic $JVM/bin/rmic +ln -sf $BINDIR/gjavah $JVM/bin/javah +ln -sf $BINDIR/jcf-dump $JVM/bin/javap +ln -sf $BINDIR/gappletviewer $JVM/bin/appletviewer +ln -sf $BINDIR/grmiregistry $JVM/bin/rmiregistry +ln -sf $BINDIR/grmiregistry $JVM/jre/bin/rmiregistry +ln -sf $BINDIR/gkeytool $JVM/bin/keytool +ln -sf $BINDIR/gkeytool $JVM/jre/bin/keytool +ln -sf $BINDIR/gij $JVM/bin/java +ln -sf $BINDIR/ecj $JVM/bin/javac +ln -sf /usr/lib/gcj-${GCJVER}-11/libjvm.so $JVM/jre/lib/${LIB_ARCH}/client/libjvm.so +ln -sf /usr/lib/gcj-${GCJVER}-11/libjvm.so $JVM/jre/lib/${LIB_ARCH}/server/libjvm.so +ln -sf /usr/lib/gcj-${GCJVER}-11/libjawt.so $JVM/jre/lib/${LIB_ARCH}/libjawt.so +ln -sf /usr/share/java/libgcj-${GCJVER}.jar $JVM/jre/lib/rt.jar +ln -sf /usr/share/java/libgcj-tools-${GCJVER}.jar $JVM/lib/tools.jar +ln -sf /usr/include/c++/${GCJVER}/gnu/java $JVM/include + +# Add a Eclipse Java Compiler wrapper which is required +# for bootstrapping OpenJDK using GNU java: +cat <<EOT > /usr/bin/ecj +#!/bin/sh + +CLASSPATH=/usr/share/java/ecj.jar\${CLASSPATH:+:}\$CLASSPATH \ + java org.eclipse.jdt.internal.compiler.batch.Main "\$@" + +EOT +chmod 755 /usr/bin/ecj + + diff --git a/source/d/gcc/ecj.sh b/source/d/gcc/ecj.sh new file mode 100644 index 00000000..1d8b7979 --- /dev/null +++ b/source/d/gcc/ecj.sh @@ -0,0 +1,5 @@ +#!/bin/sh + +CLASSPATH=@JAVADIR@/ecj.jar${CLASSPATH:+:}$CLASSPATH \ + java org.eclipse.jdt.internal.compiler.batch.Main "$@" + diff --git a/source/d/gcc/gcc-4.7.1.adalib.pic.diff b/source/d/gcc/gcc-4.7.1.adalib.pic.diff new file mode 100644 index 00000000..792ec654 --- /dev/null +++ b/source/d/gcc/gcc-4.7.1.adalib.pic.diff @@ -0,0 +1,40 @@ +From 176ff0f9a1016553978d6cf41770703e2ad90958 Mon Sep 17 00:00:00 2001 +From: jakub <jakub@138bc75d-0d04-0410-961f-82ee72b054a4> +Date: Thu, 14 Jun 2012 17:45:53 +0000 +Subject: [PATCH 1/1] * gcc-interface/Makefile.in (gnatlib-shared-default): Append + $(PICFLAG_FOR_TARGET) to GNATLIBCFLAGS_FOR_C passed to submake. + +git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gcc-4_7-branch@188623 138bc75d-0d04-0410-961f-82ee72b054a4 +--- + gcc/ada/ChangeLog | 5 +++++ + gcc/ada/gcc-interface/Makefile.in | 2 +- + 2 files changed, 6 insertions(+), 1 deletions(-) + +diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog +index 7e3195a..072a3f2 100644 +--- a/gcc/ada/ChangeLog ++++ b/gcc/ada/ChangeLog +@@ -1,3 +1,8 @@ ++2012-06-14 Jakub Jelinek <jakub@redhat.com> ++ ++ * gcc-interface/Makefile.in (gnatlib-shared-default): Append ++ $(PICFLAG_FOR_TARGET) to GNATLIBCFLAGS_FOR_C passed to submake. ++ + 2012-06-14 Release Manager + + * GCC 4.7.1 released. +diff --git a/gcc/ada/gcc-interface/Makefile.in b/gcc/ada/gcc-interface/Makefile.in +index ee8db38..f9e7eda 100644 +--- a/gcc/ada/gcc-interface/Makefile.in ++++ b/gcc/ada/gcc-interface/Makefile.in +@@ -2597,7 +2597,7 @@ gnatlib-shared-default: + $(MAKE) $(FLAGS_TO_PASS) \ + GNATLIBFLAGS="$(GNATLIBFLAGS)" \ + GNATLIBCFLAGS="$(GNATLIBCFLAGS) $(PICFLAG_FOR_TARGET)" \ +- GNATLIBCFLAGS_FOR_C="$(GNATLIBCFLAGS_FOR_C)" \ ++ GNATLIBCFLAGS_FOR_C="$(GNATLIBCFLAGS_FOR_C) $(PICFLAG_FOR_TARGET)" \ + MULTISUBDIR="$(MULTISUBDIR)" \ + THREAD_KIND="$(THREAD_KIND)" \ + gnatlib +-- +1.7.3.4 diff --git a/source/d/gcc/gcc.SlackBuild b/source/d/gcc/gcc.SlackBuild index 8288a2a4..df5f99d5 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, 2010, 2011 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -23,6 +23,8 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # +# Modified 2011 by Eric Hameleers <alien at slackware.com> for OpenJDK. + # Some notes, Fri May 16 12:31:32 PDT 2003: # # Why i486 and not i386? Because the shared C++ libraries in gcc-3.2.x will @@ -44,50 +46,65 @@ PKGNAM=gcc VERSION=${VERSION:-$(echo $PKGNAM-*.tar.xz | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-2} +BUILD=${BUILD:-1} # How many jobs to run in parallel: NUMJOBS=" -j 7 " # 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 ;; + case "$(uname -m)" in + i?86) ARCH=i486 ;; + arm*) readelf /usr/bin/file -A | egrep -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7lh ;; # Unless $ARCH is already set, use uname -m for all other archs: - *) export ARCH=$( uname -m ) ;; + *) ARCH=$(uname -m) ;; esac + export ARCH fi -TARGET=$ARCH-slackware-linux - if [ "$ARCH" = "i386" ]; then SLKCFLAGS="-O2 -march=i386 -mcpu=i686" LIBDIRSUFFIX="" + LIB_ARCH=i386 elif [ "$ARCH" = "i486" ]; then SLKCFLAGS="-O2 -march=i486 -mtune=i686" LIBDIRSUFFIX="" + LIB_ARCH=i386 elif [ "$ARCH" = "i586" ]; then SLKCFLAGS="-O2 -march=i586 -mtune=i686" LIBDIRSUFFIX="" + LIB_ARCH=i386 elif [ "$ARCH" = "i686" ]; then SLKCFLAGS="-O2 -march=i686" LIBDIRSUFFIX="" + LIB_ARCH=i386 elif [ "$ARCH" = "s390" ]; then SLKCFLAGS="-O2" LIBDIRSUFFIX="" + LIB_ARCH=s390 elif [ "$ARCH" = "x86_64" ]; then SLKCFLAGS="-O2 -fPIC" LIBDIRSUFFIX="64" + LIB_ARCH=amd64 +elif [ "$ARCH" = "armv7hl" ]; then + SLKCFLAGS="-O3 -march=armv7-a -mfpu=vfpv3-d16" + LIBDIRSUFFIX="" + LIB_ARCH=armv7hl else SLKCFLAGS="-O2" LIBDIRSUFFIX="" + LIB_ARCH=$ARCH fi +case "$ARCH" in + arm*) TARGET=$ARCH-slackware-linux-gnueabi ;; + *) TARGET=$ARCH-slackware-linux ;; +esac + CWD=$(pwd) # Temporary build location. This should *NOT* be a directory # path a non-root user could create later... -TMP=/gcc-$(mcookie) +TMP=${TMP:-"/gcc-$(mcookie)"} # This is the main DESTDIR target: PKG1=$TMP/package-gcc @@ -98,15 +115,16 @@ PKG4=$TMP/package-gcc-gnat PKG5=$TMP/package-gcc-java PKG6=$TMP/package-gcc-objc PKG7=$TMP/package-gcc-g++-gch +PKG8=$TMP/package-gcc-go # Clear the build locations: if [ -d $TMP ]; then rm -rf $TMP fi -mkdir -p $PKG{1,2,3,4,5,6,7}/usr/doc/gcc-$VERSION +mkdir -p $PKG{1,2,3,4,5,6,7,8}/usr/doc/gcc-$VERSION # Insert package descriptions: -mkdir -p $PKG{1,2,3,4,5,6,7}/install +mkdir -p $PKG{1,2,3,4,5,6,7,8}/install cat $CWD/slack-desc.gcc > $PKG1/install/slack-desc cat $CWD/slack-desc.gcc-g++ > $PKG2/install/slack-desc cat $CWD/slack-desc.gcc-gfortran > $PKG3/install/slack-desc @@ -114,6 +132,7 @@ cat $CWD/slack-desc.gcc-gnat > $PKG4/install/slack-desc cat $CWD/slack-desc.gcc-java > $PKG5/install/slack-desc cat $CWD/slack-desc.gcc-objc > $PKG6/install/slack-desc # cat $CWD/slack-desc.gcc-g++-gch > $PKG7/install/slack-desc +cat $CWD/slack-desc.gcc-go > $PKG8/install/slack-desc cd $TMP tar xvf $CWD/gcc-$VERSION.tar.?z* @@ -122,6 +141,16 @@ tar xvf $CWD/gcc-$VERSION.tar.?z* # This can be retrieved from ftp://sourceware.org/pub/java cp $CWD/ecj-4.5.jar gcc-$VERSION/ecj.jar +# Use an antlr runtime to compile javadoc. +# The runtime can be obtained from: +#https://oss.sonatype.org/content/repositories/releases/org/antlr/antlr-runtime/ +ANTLJAR=$(echo $CWD/antlr-*.jar | tail -1) + +# Upstream -fPIC fix for gnat build: +cd gcc-$VERSION + zcat $CWD/gcc-4.7.1.adalib.pic.diff.gz | patch -p1 --verbose || exit 1 +cd .. + # install docs ( cd gcc-$VERSION # Smite the fixincludes: @@ -134,9 +163,8 @@ cp $CWD/ecj-4.5.jar gcc-$VERSION/ecj.jar find . -perm 664 -exec chmod 644 {} \; mkdir -p $PKG1/usr/doc/gcc-$VERSION cp -a \ - BUGS COPYING* \ - ChangeLog.tree-ssa FAQ INSTALL \ - LAST_UPDATED MAINTAINERS \ + COPYING* ChangeLog* FAQ INSTALL \ + LAST_UPDATED MAINTAINERS NEWS \ README* *.html \ $PKG1/usr/doc/gcc-$VERSION @@ -198,6 +226,19 @@ cp $CWD/ecj-4.5.jar gcc-$VERSION/ecj.jar touch -r ChangeLog $PKG6/usr/doc/gcc-${VERSION}/gcc/objc/ChangeLog fi ) + + mkdir -p $PKG8/usr/doc/gcc-${VERSION}/gcc/go + ( cd go + if [ -r ChangeLog ]; then + cat ChangeLog | head -n 1000 > $PKG8/usr/doc/gcc-${VERSION}/gcc/go/ChangeLog + touch -r ChangeLog $PKG8/usr/doc/gcc-${VERSION}/gcc/go/ChangeLog + fi + cp -a \ + README* THREADS* \ + gofrontend/{LICENSE,PATENTS,README} \ + $PKG8/usr/doc/gcc-${VERSION}/gcc/go + ) + ) || exit 1 mkdir -p $PKG3/usr/doc/gcc-${VERSION}/libgfortran @@ -278,6 +319,7 @@ cp $CWD/ecj-4.5.jar gcc-$VERSION/ecj.jar touch -r ChangeLog $PKG2/usr/doc/gcc-${VERSION}/libstdc++-v3/ChangeLog fi ) + ) # Add fastjar to the gcc-java package: @@ -305,7 +347,7 @@ cp $CWD/ecj-4.5.jar gcc-$VERSION/ecj.jar --libdir=/usr/lib$LIBDIRSUFFIX \ --mandir=/usr/man \ --infodir=/usr/info \ - --build=$ARCH-slackware-linux + --build=$TARGET make $NUMJOBS || exit 1 make install DESTDIR=$PKG5 || exit 1 mkdir -p $PKG5/usr/doc/fastjar-$FASTJARVER @@ -372,17 +414,26 @@ cp $CWD/ecj-4.5.jar gcc-$VERSION/ecj.jar --infodir=/usr/info \ --enable-shared \ --enable-bootstrap \ - --enable-languages=ada,c,c++,fortran,java,objc,lto \ + --enable-languages=ada,c,c++,fortran,go,java,lto,objc \ --enable-threads=posix \ --enable-checking=release \ + --enable-objc-gc \ --with-system-zlib \ - --with-python-dir=/lib$LIBDIRSUFFIX/python2.6/site-packages \ + --with-python-dir=/lib$LIBDIRSUFFIX/python2.7/site-packages \ --disable-libunwind-exceptions \ --enable-__cxa_atexit \ --enable-libssp \ --enable-lto \ --with-gnu-ld \ --verbose \ + --enable-java-home \ + --with-java-home=/usr/lib$LIBDIRSUFFIX/jvm/jre \ + --with-jvm-root-dir=/usr/lib$LIBDIRSUFFIX/jvm \ + --with-jvm-jar-dir=/usr/lib$LIBDIRSUFFIX/jvm/jvm-exports \ + --with-arch-directory=$LIB_ARCH \ + --with-antlr-jar=$ANTLJAR \ + --enable-java-awt=gtk \ + --disable-gtktest \ $GCC_ARCHOPTS \ --target=${TARGET} \ --build=${TARGET} \ @@ -418,14 +469,14 @@ cp $CWD/ecj-4.5.jar gcc-$VERSION/ecj.jar rm -f $PKG1/usr/lib${LIBDIRSUFFIX}/*gdb.py # Be sure the "specs" file is installed. -if [ ! -r $PKG1/usr/lib${LIBDIRSUFFIX}/gcc/${ARCH}-slackware-linux/${VERSION}/specs ]; then - cat stage1-gcc/specs > $PKG1/usr/lib${LIBDIRSUFFIX}/gcc/${ARCH}-slackware-linux/${VERSION}/specs +if [ ! -r $PKG1/usr/lib${LIBDIRSUFFIX}/gcc/${TARGET}/${VERSION}/specs ]; then + cat stage1-gcc/specs > $PKG1/usr/lib${LIBDIRSUFFIX}/gcc/${TARGET}/${VERSION}/specs fi # Make our 64bit gcc look for 32bit gcc binaries in ./32 subdirectory: if [ "$ARCH" = "x86_64" ]; then sed -i 's#;.\(:../lib !m64 m32;\)$#;32\1#' \ - $PKG1/usr/lib${LIBDIRSUFFIX}/gcc/${ARCH}-slackware-linux/${VERSION}/specs + $PKG1/usr/lib${LIBDIRSUFFIX}/gcc/${TARGET}/${VERSION}/specs fi # make ada.install-common DESTDIR=$PKG1 @@ -462,6 +513,9 @@ rm -f $PKG1/usr/lib/libiberty.a # catch-all ln -sf gcc cc ln -sf gcc-$VERSION ${TARGET}-gcc ln -sf gcc-$VERSION ${TARGET}-gcc-$VERSION + ln -sf gcc-ar ${TARGET}-gcc-ar + ln -sf gcc-nm ${TARGET}-gcc-nm + ln -sf gcc-ranlib ${TARGET}-gcc-ranlib ln -sf gcj ${TARGET}-gcj ln -sf gcjh ${TARGET}-gcjh ln -sf g++-gcc-$VERSION ${TARGET}-c++ @@ -531,6 +585,11 @@ rm -f $PKG1/usr/lib/libiberty.a # catch-all ) # gcc-gnat: +# First, relocate usr/bin/gnative2ascii to the gcc-java package so it +# isn't matched and accidentally put in gcc-gnat: +mkdir -p $PKG5/usr/bin +mv $PKG1/usr/bin/gnative2ascii $PKG5/usr/bin +# Now make the gcc-gnat package tree: ( cd $PKG4 mkdir -p usr/bin mv $PKG1/usr/bin/gnat* usr/bin @@ -583,11 +642,11 @@ rm -f $PKG1/usr/lib/libiberty.a # catch-all 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 !" + if [ ! -d $PKG1/usr/lib${LIBDIRSUFFIX}/python2.7 ]; then + echo "NO $PKG1/usr/lib${LIBDIRSUFFIX}/python2.7 !" exit 1 fi - mv $PKG1/usr/lib${LIBDIRSUFFIX}/python2.6 usr/lib${LIBDIRSUFFIX} + mv $PKG1/usr/lib${LIBDIRSUFFIX}/python2.7 usr/lib${LIBDIRSUFFIX} mkdir -p usr/info mv $PKG1/usr/info/gcj.* usr/info # mv $PKG1/usr/info/fastjar.* usr/info @@ -633,8 +692,24 @@ rm -f $PKG1/usr/lib/libiberty.a # catch-all 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/man/man3 + mv $PKG1/usr/man/man3/ffi* usr/man/man3 mkdir -p usr/share mv $PKG1/usr/share/java usr/share + # The ecj wrapper script: + cat $CWD/ecj.sh | sed -e "s,@JAVADIR@,/usr/share/java," > usr/bin/ecj + chmod 755 usr/bin/ecj + # The JAVA_HOME compatibility links. + # Caution: non-multilib arch-independent stuff! No lib64 here. + mkdir -p usr/lib$LIBDIRSUFFIX + mv $PKG1/usr/lib$LIBDIRSUFFIX/jvm* usr/lib$LIBDIRSUFFIX + # And add the missing javac symlink: + ln -s ../../../bin/ecj usr/lib$LIBDIRSUFFIX/jvm/bin/javac + # Don't package libffi stuff anymore. GCC will link the internal version + # statically, and we'll need a newer one elsewhere. + find . -name "ffi*.h" | xargs rm + find . -name "libffi*" | xargs rm + rm usr/man/man3/ffi* ) # gcc-objc: @@ -655,6 +730,25 @@ rm -f $PKG1/usr/lib/libiberty.a # catch-all # mv $PKG2/usr/include/c++/$VERSION/$TARGET/bits/stdc++.h.gch usr/include/c++/$VERSION/$TARGET/bits #) +# gcc-go: +( cd $PKG8 + mkdir -p usr/bin + mv $PKG1/usr/bin/*gccgo* usr/bin + mkdir -p usr/libexec/gcc/$TARGET/$VERSION + mv $PKG1/usr/libexec/gcc/$TARGET/$VERSION/go1 usr/libexec/gcc/$TARGET/$VERSION/go1 + mkdir -p usr/info + mv $PKG1/usr/info/gccgo.info.gz usr/info + mkdir -p usr/lib${LIBDIRSUFFIX} + mv $PKG1/usr/lib${LIBDIRSUFFIX}/go usr/lib${LIBDIRSUFFIX} + mv $PKG1/usr/lib${LIBDIRSUFFIX}/{libgo.la,libgo.so.0.*,libgobegin.a} usr/lib${LIBDIRSUFFIX} || exit 1 + # Ordinarily Slackware doesn't package static libraries, but in this case + # it is useful for deploying compiled binaries on machines that do not yet + # have libgo.so.0.0.0. + mv $PKG1/usr/lib${LIBDIRSUFFIX}/libgo.a usr/lib${LIBDIRSUFFIX} + mkdir -p usr/man/man1 + mv $PKG1/usr/man/man1/gccgo.1.gz usr/man/man1 +) || exit 1 + # Filter all .la files (thanks much to Mark Post for the sed script): ( cd $TMP for file in $(find . -type f -name "*.la") ; do @@ -665,7 +759,7 @@ rm -f $PKG1/usr/lib/libiberty.a # catch-all ) ## Strip bloated binaries and libraries: -for dir in $PKG{1,2,3,4,5,6}; do +for dir in $PKG{1,2,3,4,5,6,8}; do ( cd $dir find . -name "lib*so*" -exec strip --strip-unneeded "{}" \; find . -name "lib*a" -exec strip -g "{}" \; @@ -689,6 +783,8 @@ done makepkg -l y -c n $TMP/gcc-objc-$VERSION-$ARCH-$BUILD.txz ) #( cd $PKG7 # makepkg -l y -c n $TMP/gcc-g++-gch-$VERSION-$ARCH-$BUILD.txz ) +( cd $PKG8 + makepkg -l y -c n $TMP/gcc-go-$VERSION-$ARCH-$BUILD.txz ) echo echo "Slackware GCC package build complete!" diff --git a/source/d/gcc/slack-desc.gcc-gfortran b/source/d/gcc/slack-desc.gcc-gfortran index ac844f0f..5141cb02 100644 --- a/source/d/gcc/slack-desc.gcc-gfortran +++ b/source/d/gcc/slack-desc.gcc-gfortran @@ -8,12 +8,12 @@ |-----handy-ruler------------------------------------------------------| gcc-gfortran: gcc-gfortran (Fortran support for GCC) gcc-gfortran: +gcc-gfortran: The GNU Fortran compiler is fully compliant with the Fortran 95 +gcc-gfortran: Standard and includes legacy F77 support. In addition, a significant +gcc-gfortran: number of Fortran 2003 and Fortran 2008 features are implemented. +gcc-gfortran: GNU Fortran also contains many standard and extensions and can be +gcc-gfortran: used to run real-world programs. +gcc-gfortran: gcc-gfortran: This package contains those parts of the compiler collection -gcc-gfortran: needed to compile Fortran code. The base gcc package is also -gcc-gfortran: required. The GNU Fortran compiler is able to compile nearly all -gcc-gfortran: standard-compliant Fortran 95, Fortran 90, and Fortran 77 programs, -gcc-gfortran: including a number of standard and non-standard extensions, and can -gcc-gfortran: be used on real-world programs. In particular, the supported -gcc-gfortran: extensions include OpenMP, Cray-style pointers, and several Fortran -gcc-gfortran: 2003 features such as enumeration, stream I/O, and some of the -gcc-gfortran: enhancements to allocatable array support from TR 15581. +gcc-gfortran: needed to compile Fortran code. The gcc package is also required. +gcc-gfortran: diff --git a/source/d/gcc/slack-desc.gcc-go b/source/d/gcc/slack-desc.gcc-go new file mode 100644 index 00000000..cdd859bc --- /dev/null +++ b/source/d/gcc/slack-desc.gcc-go @@ -0,0 +1,19 @@ +# HOW TO EDIT THIS FILE: +# The "handy ruler" below makes it easier to edit a package description. Line +# up the first '|' above the ':' following the base package name, and the '|' on +# the right side marks the last column you can put a character in. You must make +# exactly 11 lines for the formatting to be correct. It's also customary to +# leave one space after the ':'. + + |-----handy-ruler------------------------------------------------------| +gcc-go: gcc-go (Go support for GCC) +gcc-go: +gcc-go: Go is a compiled, garbage-collected, concurrent programming language +gcc-go: developed by Google Inc. The initial design of Go was started in +gcc-go: September 2007 by Robert Griesemer, Rob Pike, and Ken Thompson. +gcc-go: Rob Pike has stated that Go is being used "for real stuff" at Google. +gcc-go: Go's "gc" compiler targets the Linux, Mac OS X, FreeBSD, OpenBSD and +gcc-go: Microsoft Windows operating systems, and the i386, amd64, and ARM +gcc-go: processor architectures. +gcc-go: +gcc-go: Homepage: http://golang.org diff --git a/source/d/gdb/gdb.SlackBuild b/source/d/gdb/gdb.SlackBuild index 6e418a4b..a3f3e742 100755 --- a/source/d/gdb/gdb.SlackBuild +++ b/source/d/gdb/gdb.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2008, 2009, 2010, 2011 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2008, 2009, 2010, 2011, 2012 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -23,7 +23,7 @@ PKGNAM=gdb VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-2} +BUILD=${BUILD:-1} NUMJOBS=${NUMJOBS:-" -j7 "} @@ -66,7 +66,7 @@ find . \ --libdir=/usr/lib${LIBDIRSUFFIX} \ --mandir=/usr/man \ --infodir=/usr/info \ - --without-python \ + --with-python \ --build=$ARCH-slackware-linux ( cd readline ; make ) diff --git a/source/d/git/git-1.7.4.4.tar.sign b/source/d/git/git-1.7.4.4.tar.sign deleted file mode 100644 index 5f44bdd4..00000000 --- a/source/d/git/git-1.7.4.4.tar.sign +++ /dev/null @@ -1,8 +0,0 @@ ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.11 (GNU/Linux) -Comment: See http://www.kernel.org/signature.html for info - -iD8DBQBNnMpoyGugalF9Dw4RAmY4AJ9IRB87m9225xl29RAHxv2GPl7WpgCdFz47 -lh3KZrjZ5s7H4ZQSDncWQyU= -=tRV0 ------END PGP SIGNATURE----- diff --git a/source/d/git/git.url b/source/d/git/git.url new file mode 100644 index 00000000..a88fd582 --- /dev/null +++ b/source/d/git/git.url @@ -0,0 +1 @@ +http://git-core.googlecode.com/ diff --git a/source/d/intltool/intltool.SlackBuild b/source/d/intltool/intltool.SlackBuild index 1588d50f..ef265b32 100755 --- a/source/d/intltool/intltool.SlackBuild +++ b/source/d/intltool/intltool.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2008, 2009, 2010 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2008, 2009, 2010, 2012 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -73,7 +73,6 @@ CFLAGS="$SLKCFLAGS" \ --mandir=/usr/man \ --infodir=/usr/info \ --docdir=/usr/doc/${PKGNAM}-$VERSION \ - --disable-static \ --build=$ARCH-slackware-linux # Build and install: diff --git a/source/d/llvm/llvm.SlackBuild b/source/d/llvm/llvm.SlackBuild new file mode 100755 index 00000000..47c96695 --- /dev/null +++ b/source/d/llvm/llvm.SlackBuild @@ -0,0 +1,173 @@ +#!/bin/sh + +# Slackware build script for llvm + +# Copyright 2008-2011 Heinz Wiesinger, Amsterdam, The Netherlands +# Copyright 2012 Patrick J. Volkerding, Sebeka, MN, USA +# All rights reserved. +# +# Redistribution and use of this script, with or without modification, is +# permitted provided that the following conditions are met: +# +# 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 +# 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, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; +# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR +# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF +# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +PKGNAM=llvm +VERSION=3.0 +BUILD=${BUILD:-2} + +NUMJOBS=${NUMJOBS:-" -j7 "} + +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) ARCH=i486 ;; + arm*) ARCH=arm ;; + *) ARCH=$( uname -m ) ;; + esac +fi + +CWD=$(pwd) +TMP=${TMP:-/tmp} +PKG=$TMP/package-$PKGNAM + +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 + +CLANG=${CLANG:-yes} + +rm -rf $PKG +mkdir -p $TMP $PKG +cd $TMP +rm -rf $PKGNAM-${VERSION}.src +tar xvf $CWD/$PKGNAM-$VERSION.tar.xz + +if [ "$CLANG" = "no" ]; then + cd $PKGNAM-${VERSION}.src +else + cd $PKGNAM-${VERSION}.src/tools + rm -rf clang clang-${VERSION}.src + tar xvf $CWD/clang-$VERSION.tar.xz + mv clang-${VERSION}.src clang + cd ../ + + # clang fixes for slackware + # No longer needed as of llvm/clang 3.0? + #patch -p1 -d tools/clang -i $CWD/clang-slackware.diff +fi + +chown -R root:root . +chmod -R u+w,go+r-w,a-s . + +CINC="/usr/include/" +GCCDIR=/usr/lib$LIBDIRSUFFIX/gcc/$ARCH-slackware-linux*/*/ +CINC="$CINC:$(echo ${GCCDIR})/include/" +CINC="$CINC:$(echo ${GCCDIR})/include-fixed/" + +# --mandir doesn't work currently +# need to disable assertions to make llvm thread-safe +CFLAGS="$SLKCFLAGS" \ +CXXFLAGS="$SLKCFLAGS" \ +./configure \ + --prefix=/usr \ + --libdir=/usr/lib$LIBDIRSUFFIX \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --mandir=/usr/man \ + --enable-optimized \ + --disable-assertions \ + --enable-pic \ + --with-c-include-dirs=$CINC \ + --build=$ARCH-slackware-linux \ + --host=$ARCH-slackware-linux || exit 1 + +# Correct libdir setting +sed -i "s|\$(PROJ_prefix)/lib|\$(PROJ_prefix)/lib$LIBDIRSUFFIX|" \ + Makefile.config + +if [ "$CLANG" != "no" ]; then + sed -i "s|\$(PROJ_prefix)/lib|\$(PROJ_prefix)/lib$LIBDIRSUFFIX|" \ + tools/clang/lib/Headers/Makefile +fi + +make $NUMJOBS || make || exit 1 +make install DESTDIR=$PKG || exit 1 + +if [ "$CLANG" != "no" ]; then + # install clang-static-analyzer + mkdir -p $PKG/usr/lib$LIBDIRSUFFIX/clang-analyzer + cp -pr tools/clang/tools/scan-{build,view} \ + $PKG/usr/lib$LIBDIRSUFFIX/clang-analyzer/ || exit 1 + for i in scan-{build,view}; do + ln -s /usr/lib$LIBDIRSUFFIX/clang-analyzer/$i/$i \ + $PKG/usr/bin/$i || exit 1 + done + for i in ccc c++; do + ln -s /usr/lib$LIBDIRSUFFIX/clang-analyzer/scan-build/$i-analyzer \ + $PKG/usr/bin/$i-analyzer || exit 1 + done +fi + +# Remove example libraries +rm -f $PKG/usr/lib$LIBDIRSUFFIX/LLVMHello* + +# Fix wrong libdir +sed -i -e "s|ABS_RUN_DIR/lib\"|ABS_RUN_DIR/lib$LIBDIRSUFFIX\"|" \ + $PKG/usr/bin/llvm-config + +# Move man page directory: +mv $PKG/usr/share/man $PKG/usr/ +# Try to remove /usr/share, which should be empty now. If it's not, fine. +rmdir $PKG/usr/share + +# 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 manual pages: +find $PKG/usr/man -type f -exec gzip -9 {} \; +for i in $( find $PKG/usr/man -type l ) ; do + ln -s $( readlink $i ).gz $i.gz + rm $i +done + +mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION +cp -a CREDITS* LICENSE* README* $PKG/usr/doc/$PKGNAM-$VERSION +mv $PKG/usr/docs/llvm/* $PKG/usr/doc/$PKGNAM-$VERSION +rm -rf $PKG/usr/docs + +if [ "$CLANG" != "no" ]; then + mkdir $PKG/usr/doc/$PKGNAM-$VERSION/clang + cp -a tools/clang/{INSTALL,NOTES,README,TODO}* \ + $PKG/usr/doc/$PKGNAM-$VERSION/clang +fi + +mkdir -p $PKG/install +cat $CWD/slack-desc > $PKG/install/slack-desc + +cd $PKG +/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz + diff --git a/source/d/llvm/llvm.url b/source/d/llvm/llvm.url new file mode 100644 index 00000000..369fedab --- /dev/null +++ b/source/d/llvm/llvm.url @@ -0,0 +1,2 @@ +http://llvm.org/releases/3.0/llvm-3.0.tar.gz +http://llvm.org/releases/3.0/clang-3.0.tar.gz diff --git a/source/d/llvm/slack-desc b/source/d/llvm/slack-desc new file mode 100644 index 00000000..b466d361 --- /dev/null +++ b/source/d/llvm/slack-desc @@ -0,0 +1,19 @@ +# HOW TO EDIT THIS FILE: +# The "handy ruler" below makes it easier to edit a package description. Line +# up the first '|' above the ':' following the base package name, and the '|' +# on the right side marks the last column you can put a character in. You must +# make exactly 11 lines for the formatting to be correct. It's also +# customary to leave one space after the ':' except on otherwise blank lines. + + |-----handy-ruler------------------------------------------------------| +llvm: llvm (LLVM compiler toolkit) +llvm: +llvm: Low Level Virtual Machine is a toolkit for the construction of highly +llvm: optimized compilers, optimizers, and runtime environments. +llvm: +llvm: This package also includes the clang frontend for the C family of +llvm: languages: C, C++, Objective-C, and Objective-C++ +llvm: +llvm: +llvm: Homepage: http://llvm.org/ +llvm: diff --git a/source/d/make/make-3.82-android-build-fix.diff b/source/d/make/make-3.82-android-build-fix.diff new file mode 100644 index 00000000..8cd3db0d --- /dev/null +++ b/source/d/make/make-3.82-android-build-fix.diff @@ -0,0 +1,16 @@ +--- make-3.82/function.c 2010-07-13 03:20:39.000000000 +0200 ++++ make-3.82/function.c 2010-10-27 01:43:27.000000000 +0200 +@@ -1138,12 +1138,12 @@ func_sort (char *o, char **argv, const c + { + char c = *(t++); + +- if (! isspace ((unsigned char)c)) ++ if (! isblank ((unsigned char)c)) + continue; + + ++wordi; + +- while (isspace ((unsigned char)*t)) ++ while (isblank ((unsigned char)*t)) + ++t; + } diff --git a/source/d/make/make.SlackBuild b/source/d/make/make.SlackBuild index 97cbd99c..18f701b6 100755 --- a/source/d/make/make.SlackBuild +++ b/source/d/make/make.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2005-2009, 2010 Patrick J. Volkerding, Sebeka, Minnesota, USA +# Copyright 2005-2011 Patrick J. Volkerding, Sebeka, Minnesota, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -23,7 +23,7 @@ PKGNAM=make VERSION=${VERSION:-$(echo $PKGNAM-*.tar.bz2 | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-2} +BUILD=${BUILD:-3} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then @@ -70,6 +70,9 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; +# Fix a problem using make-3.82 to build Android: +zcat $CWD/make-3.82-android-build-fix.diff.gz | patch -p1 --verbose || exit 1 + CFLAGS="$SLKCFLAGS" \ ./configure \ --prefix=/usr \ diff --git a/source/d/oprofile/oprofile.SlackBuild b/source/d/oprofile/oprofile.SlackBuild index df18feef..8df342e3 100755 --- a/source/d/oprofile/oprofile.SlackBuild +++ b/source/d/oprofile/oprofile.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2005-2011 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2005-2012 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -22,7 +22,7 @@ VERSION=${VERSION:-$(echo oprofile-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-5} +BUILD=${BUILD:-3} NUMJOBS=${NUMJOBS:-" -j7 "} @@ -64,7 +64,7 @@ rm -rf oprofile-$VERSION tar xvf $CWD/oprofile-$VERSION.tar.?z* || exit 1 cd oprofile-$VERSION -zcat $CWD/oprofile.qt4.diff.gz | patch -p1 --verbose || exit 1 +zcat $CWD/oprofile.binutils.diff.gz | patch -p1 --verbose || exit 1 ./autogen.sh diff --git a/source/d/oprofile/oprofile.binutils.diff b/source/d/oprofile/oprofile.binutils.diff new file mode 100644 index 00000000..947ce5d5 --- /dev/null +++ b/source/d/oprofile/oprofile.binutils.diff @@ -0,0 +1,44 @@ +diff -u -r --new-file oprofile-0.9.7.orig/libopagent/opagent.c oprofile-0.9.7/libopagent/opagent.c +--- oprofile-0.9.7.orig/libopagent/opagent.c 2011-07-04 21:25:04.000000000 -0500 ++++ oprofile-0.9.7/libopagent/opagent.c 2012-06-20 10:59:17.851896225 -0500 +@@ -60,6 +60,7 @@ + #include <fcntl.h> + #include <unistd.h> + #include <time.h> ++#include "config.h" + #include <bfd.h> + + #include "opagent.h" +diff -u -r --new-file oprofile-0.9.7.orig/libpp/symbol.h oprofile-0.9.7/libpp/symbol.h +--- oprofile-0.9.7.orig/libpp/symbol.h 2011-07-04 21:25:04.000000000 -0500 ++++ oprofile-0.9.7/libpp/symbol.h 2012-06-20 10:59:23.579895917 -0500 +@@ -18,6 +18,7 @@ + #include "format_flags.h" + #include "op_types.h" + ++#include "config.h" + #include <bfd.h> + #include <stdint.h> + +diff -u -r --new-file oprofile-0.9.7.orig/opjitconv/debug_line.c oprofile-0.9.7/opjitconv/debug_line.c +--- oprofile-0.9.7.orig/opjitconv/debug_line.c 2011-07-04 21:25:04.000000000 -0500 ++++ oprofile-0.9.7/opjitconv/debug_line.c 2012-06-20 10:59:40.620895008 -0500 +@@ -13,6 +13,7 @@ + #include <string.h> + #include <stddef.h> + #include <stdio.h> ++#include "config.h" + #include <bfd.h> + #include <limits.h> + +diff -u -r --new-file oprofile-0.9.7.orig/opjitconv/opjitconv.h oprofile-0.9.7/opjitconv/opjitconv.h +--- oprofile-0.9.7.orig/opjitconv/opjitconv.h 2011-07-04 21:25:04.000000000 -0500 ++++ oprofile-0.9.7/opjitconv/opjitconv.h 2012-06-20 10:59:35.387895285 -0500 +@@ -26,6 +26,7 @@ + #define OP_JIT_CONV_ALREADY_DONE 5 + #define OP_JIT_CONV_TMPDIR_NOT_REMOVED 6 + ++#include "config.h" + #include <bfd.h> + #include <stddef.h> + #include <sys/stat.h> diff --git a/source/d/oprofile/oprofile.qt4.diff b/source/d/oprofile/oprofile.qt4.diff deleted file mode 100644 index e5506a82..00000000 --- a/source/d/oprofile/oprofile.qt4.diff +++ /dev/null @@ -1,3194 +0,0 @@ -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 ca044b91..df535c7d 100755 --- a/source/d/perl/perl.SlackBuild +++ b/source/d/perl/perl.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2009, 2010, 2011 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2009, 2010, 2011, 2012 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -24,9 +24,7 @@ # originally by: David Cantrell <david@slackware.com> # maintained by: <volkerdi@slackware.com> -VERSION=5.12.3 -# IMPORTANT: also update -Dinc_version_list with the previous Slackware -# perl version in ./configure below! +VERSION=5.16.1 BUILD=${BUILD:-1} # Automatically determine the architecture we're building on: @@ -46,11 +44,11 @@ TMP=${TMP:-/tmp} PKG=$TMP/package-perl # Additional required modules: -DBDMYSQL=4.018 -DBI=1.616 -URI=1.58 -XMLPARSER=2.40 -XMLSIMPLE=2.18 +DBDMYSQL=4.021 +DBI=1.622 +URI=1.60 +XMLPARSER=2.41 +XMLSIMPLE=2.20 if [ "$ARCH" = "i386" ]; then SLKCFLAGS="-O2 -march=i386 -mcpu=i686" @@ -119,16 +117,29 @@ fi # Configure perl: ./Configure -de \ -Dprefix=/usr \ + -Dsiteprefix=/usr/local \ + -Dsitelib="/usr/local/share/perl5" \ + -Dsitearch="/usr/local/lib${LIBDIRSUFFIX}/perl5" \ + -Darchlib="/usr/lib${LIBDIRSUFFIX}/perl5" \ -Dvendorprefix=/usr \ + -Dprivlib="/usr/share/perl5" \ + -Dvendorlib="/usr/share/perl5/vendor_perl" \ + -Dvendorarch="/usr/lib${LIBDIRSUFFIX}/perl5/vendor_perl" \ + -Dscriptdir='/usr/bin' \ -Dcccdlflags='-fPIC' \ -Dinstallprefix=/usr \ -Dlibpth="/usr/local/lib${LIBDIRSUFFIX} /usr/lib${LIBDIRSUFFIX} /lib${LIBDIRSUFFIX}" \ -Doptimize="$SLKCFLAGS" \ $USE_THREADS \ + -Duseshrplib \ + -Ubincompat5005 \ + -Uversiononly \ -Dpager='/usr/bin/less -isr' \ - -Dinc_version_list='5.12.2 5.12.1 5.12.0 5.10.1 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 +# -Duseshrplib creates libperl.so +# -Ubincompat5005 helps create DSO -> libperl.so + # Kludge for gcc-4.2.4's needlessly changed output: cat makefile | grep -v '\<command-line\>' > foo mv foo makefile @@ -146,11 +157,11 @@ make install ln -sf c2ph pstruct ln -sf s2p psed ) -mkdir -p /usr/lib${LIBDIRSUFFIX}/perl5/vendor_perl/${VERSION}/${ARCH}-linux-thread-multi +#mkdir -p /usr/lib${LIBDIRSUFFIX}/perl5/vendor_perl/${VERSION}/${ARCH}-linux-thread-multi # Install perl package: make install DESTDIR=$PKG -mkdir -p $PKG/usr/lib${LIBDIRSUFFIX}/perl5/vendor_perl/${VERSION}/${ARCH}-linux-thread-multi +#mkdir -p $PKG/usr/lib${LIBDIRSUFFIX}/perl5/vendor_perl/${VERSION}/${ARCH}-linux-thread-multi # Add additional modules: ( cd ext @@ -237,8 +248,9 @@ mkdir -p $PKG/usr/lib${LIBDIRSUFFIX}/perl5/vendor_perl/${VERSION}/${ARCH}-linux- # Install documentation mkdir -p $PKG/usr/doc/perl-$VERSION cp -a \ - AUTHORS Artistic Changes Copying INSTALL MANIFEST \ - README README.{cn,jp,ko,tw} README.linux \ + AUTHORS Artistic Changes Copying INSTALL \ + README* \ + README.{cn,jp,ko,tw} README.linux \ $PKG/usr/doc/perl-$VERSION # We follow LSB with symlinks in /usr/share: @@ -258,11 +270,10 @@ cp -a \ chmod 755 $PKG/usr/bin/* chmod 644 $PKG/usr/man/man?/* -rmdir $PKG/usr/share # This file shouldn't get clobbered: -if [ -r $PKG/usr/lib${LIBDIRSUFFIX}/perl5/${VERSION}/${ARCH}-linux-thread-multi/perllocal.pod ]; then - mv $PKG/usr/lib${LIBDIRSUFFIX}/perl5/${VERSION}/${ARCH}-linux-thread-multi/perllocal.pod $PKG/usr/lib${LIBDIRSUFFIX}/perl5/${VERSION}/${ARCH}-linux-thread-multi/perllocal.pod.new +if [ -r $PKG/usr/lib${LIBDIRSUFFIX}/perl5/perllocal.pod ]; then + mv $PKG/usr/lib${LIBDIRSUFFIX}/perl5/perllocal.pod $PKG/usr/lib${LIBDIRSUFFIX}/perl5/perllocal.pod.new fi # Insert the slack-desc: @@ -284,7 +295,7 @@ config() { fi # Otherwise, we leave the .new copy for the admin to consider... } -config usr/lib/perl5/${VERSION}/i486-linux-thread-multi/perllocal.pod.new +config usr/lib/perl5/perllocal.pod.new EOF # Build the package: diff --git a/source/d/python/python.SlackBuild b/source/d/python/python.SlackBuild index debd7e95..220f3f02 100755 --- a/source/d/python/python.SlackBuild +++ b/source/d/python/python.SlackBuild @@ -1,6 +1,6 @@ #!/bin/bash -# Copyright 2008, 2009, 2010 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2008, 2009, 2012 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -21,8 +21,11 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -VERSION=${VERSION:-2.6.6} -BUILD=${BUILD:-1} +PKGNAM=python +SRCNAM=Python +VERSION=$(echo $SRCNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev) +BRANCH_VERSION=$(echo $VERSION | cut -f 1,2 -d . ) +BUILD=${BUILD:-2} NUMJOBS=${NUMJOBS:-" -j7 "} @@ -38,7 +41,7 @@ fi CWD=$(pwd) TMP=${TMP:-/tmp} -PKG=$TMP/package-python +PKG=$TMP/package-$PKGNAM rm -rf $PKG mkdir -p $TMP $PKG @@ -57,22 +60,23 @@ elif [ "$ARCH" = "armel" ]; then fi # Location for Python site-packages: -SITEPK=$PKG/usr/lib${LIBDIRSUFFIX}/python2.6/site-packages +SITEPK=$PKG/usr/lib${LIBDIRSUFFIX}/${PKGNAM}${BRANCH_VERSION}/site-packages # same as above without $PKG -TOOLSDIR=/usr/lib${LIBDIRSUFFIX}/python2.6/site-packages +TOOLSDIR=/usr/lib${LIBDIRSUFFIX}/${PKGNAM}${BRANCH_VERSION}/site-packages cd $TMP -rm -rf Python-$VERSION -tar xf $CWD/Python-$VERSION.tar.?z* || exit 1 -cd Python-$VERSION +rm -rf $SRCNAM-$VERSION +tar xf $CWD/$SRCNAM-$VERSION.tar.?z* || exit 1 +cd $SRCNAM-$VERSION zcat $CWD/python.readline.set_pre_input_hook.diff.gz | patch -p1 --verbose || exit 1 +# We don't want a large libpython*.a: +zcat $CWD/python.no-static-library.diff.gz | patch -p1 --verbose || exit 1 if [ "$ARCH" = "x86_64" ]; then - # Install to lib64 instead of lib: - zcat $CWD/python.x86_64.diff.gz | patch -p1 --verbose || exit 1 - # Python must report /usr/lib64/python2.6/site-packages as python_lib_dir: - zcat $CWD/python.pure64.diff.gz | patch -p1 --verbose || exit 1 + # Install to lib64 instead of lib and + # Python must report /usr/lib64/python2.7/site-packages as python_lib_dir: + zcat $CWD/python.x86_64.diff.gz | patch -p1 --verbose || exit 1 fi chown -R root:root . @@ -87,7 +91,6 @@ find . \ --libdir=/usr/lib${LIBDIRSUFFIX} \ --mandir=/usr/man \ --docdir=/usr/doc/python-$VERSION \ - --with-ncurses \ --with-threads \ --enable-ipv6 \ --enable-shared \ @@ -112,7 +115,6 @@ mv $SITEPK/README $PKG/usr/doc/python-$VERSION/README.python-tools # Make a few useful symlinks: mkdir -p $PKG/usr/bin ( cd $PKG/usr/bin - ln -sf $TOOLSDIR/modulator/modulator.py modulator ln -sf $TOOLSDIR/pynche/pynche pynche ln -sf $TOOLSDIR/i18n/msgfmt.py . ln -sf $TOOLSDIR/i18n/pygettext.py . @@ -126,9 +128,17 @@ tar xf $CWD/python-$VERSION-docs-text.tar.?z* mv python-${VERSION}-docs-text/* $PKG/usr/doc/python-$VERSION/Documentation chown -R root:root $PKG/usr/doc/python-$VERSION +# Fix possible incorrect permissions: +( cd $PKG + find . -type d -exec chmod 755 "{}" \; + find . -perm 640 -exec chmod 644 "{}" \; + find . -perm 750 -exec chmod 755 "{}" \; +) + + ( cd $PKG/usr/bin rm -f python - ln -sf python2.6 python + ln -sf python${BRANCH_VERSION} python ) ( cd $PKG @@ -143,6 +153,12 @@ chown -R root:root $PKG/usr/doc/python-$VERSION for i in $(find . -type l) ; do ln -s $(readlink $i).gz $i.gz ; rm $i ; done ) +( cd $PKG/usr/man + if [ -r python${BRANCH_VERSION}.1.gz ] ; then + ln -sf python${BRANCH_VERSION}.1.gz python.1.gz + fi +) + mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc diff --git a/source/d/python/python.no-static-library.diff b/source/d/python/python.no-static-library.diff new file mode 100644 index 00000000..96209897 --- /dev/null +++ b/source/d/python/python.no-static-library.diff @@ -0,0 +1,49 @@ +--- ./Makefile.pre.in.orig 2012-04-09 18:07:33.000000000 -0500 ++++ ./Makefile.pre.in 2012-05-09 13:38:24.913226185 -0500 +@@ -396,7 +396,7 @@ + + + # Build the interpreter +-$(BUILDPYTHON): Modules/python.o $(LIBRARY) $(LDLIBRARY) ++$(BUILDPYTHON): Modules/python.o $(LDLIBRARY) + $(LINKCC) $(LDFLAGS) $(LINKFORSHARED) -o $@ \ + Modules/python.o \ + $(BLDLIBRARY) $(LIBS) $(MODLIBS) $(SYSLIBS) $(LDLAST) +@@ -412,18 +412,6 @@ + *) $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' ./$(BUILDPYTHON) -E $(srcdir)/setup.py build;; \ + esac + +-# Build static library +-# avoid long command lines, same as LIBRARY_OBJS +-$(LIBRARY): $(LIBRARY_OBJS) +- -rm -f $@ +- $(AR) $(ARFLAGS) $@ Modules/getbuildinfo.o +- $(AR) $(ARFLAGS) $@ $(PARSER_OBJS) +- $(AR) $(ARFLAGS) $@ $(OBJECT_OBJS) +- $(AR) $(ARFLAGS) $@ $(PYTHON_OBJS) +- $(AR) $(ARFLAGS) $@ $(MODULE_OBJS) $(SIGNAL_OBJS) +- $(AR) $(ARFLAGS) $@ $(MODOBJS) +- $(RANLIB) $@ +- + libpython$(VERSION).so: $(LIBRARY_OBJS) + if test $(INSTSONAME) != $(LDLIBRARY); then \ + $(BLDSHARED) -Wl,-h$(INSTSONAME) -o $(INSTSONAME) $(LIBRARY_OBJS) $(MODLIBS) $(SHLIBS) $(LIBC) $(LIBM) $(LDLAST); \ +@@ -1008,18 +996,6 @@ + else true; \ + fi; \ + done +- @if test -d $(LIBRARY); then :; else \ +- if test "$(PYTHONFRAMEWORKDIR)" = no-framework; then \ +- if test "$(SO)" = .dll; then \ +- $(INSTALL_DATA) $(LDLIBRARY) $(DESTDIR)$(LIBPL) ; \ +- else \ +- $(INSTALL_DATA) $(LIBRARY) $(DESTDIR)$(LIBPL)/$(LIBRARY) ; \ +- $(RANLIB) $(DESTDIR)$(LIBPL)/$(LIBRARY) ; \ +- fi; \ +- else \ +- echo Skip install of $(LIBRARY) - use make frameworkinstall; \ +- fi; \ +- fi + $(INSTALL_DATA) Modules/config.c $(DESTDIR)$(LIBPL)/config.c + $(INSTALL_DATA) Modules/python.o $(DESTDIR)$(LIBPL)/python.o + $(INSTALL_DATA) $(srcdir)/Modules/config.c.in $(DESTDIR)$(LIBPL)/config.c.in diff --git a/source/d/python/python.pure64.diff b/source/d/python/python.pure64.diff deleted file mode 100644 index 7e4821af..00000000 --- a/source/d/python/python.pure64.diff +++ /dev/null @@ -1,30 +0,0 @@ ---- ./Lib/distutils/command/install.py.orig 2010-11-27 17:21:23.000000000 -0600 -+++ ./Lib/distutils/command/install.py 2010-11-27 17:25:02.000000000 -0600 -@@ -41,14 +41,14 @@ - - INSTALL_SCHEMES = { - 'unix_prefix': { -- 'purelib': '$base/lib/python$py_version_short/site-packages', -+ 'purelib': '$base/lib64/python$py_version_short/site-packages', - 'platlib': '$platbase/lib64/python$py_version_short/site-packages', - 'headers': '$base/include/python$py_version_short/$dist_name', - 'scripts': '$base/bin', - 'data' : '$base', - }, - 'unix_home': { -- 'purelib': '$base/lib/python', -+ 'purelib': '$base/lib64/python', - 'platlib': '$base/lib64/python', - 'headers': '$base/include/python/$dist_name', - 'scripts': '$base/bin', ---- ./Lib/distutils/sysconfig.py.orig 2010-11-27 17:21:23.000000000 -0600 -+++ ./Lib/distutils/sysconfig.py 2010-11-27 17:25:02.000000000 -0600 -@@ -122,7 +122,7 @@ - if plat_specific or standard_lib: - lib = "lib64" - else: -- lib = "lib" -+ lib = "lib64" - libpython = os.path.join(prefix, - lib, "python" + get_python_version()) - if standard_lib: diff --git a/source/d/python/python.readline.set_pre_input_hook.diff b/source/d/python/python.readline.set_pre_input_hook.diff index 8f5570c9..8af4b4be 100644 --- a/source/d/python/python.readline.set_pre_input_hook.diff +++ b/source/d/python/python.readline.set_pre_input_hook.diff @@ -1,5 +1,5 @@ ---- ./Modules/readline.c.orig 2010-05-09 10:15:40.000000000 -0500 -+++ ./Modules/readline.c 2010-11-27 17:08:38.000000000 -0600 +--- ./Modules/readline.c.orig 2008-11-04 14:43:31.000000000 -0600 ++++ ./Modules/readline.c 2009-06-09 14:23:16.000000000 -0500 @@ -11,6 +11,9 @@ #include <errno.h> #include <sys/time.h> diff --git a/source/d/python/python.x86_64.diff b/source/d/python/python.x86_64.diff index cb6bf258..0e7c6c45 100644 --- a/source/d/python/python.x86_64.diff +++ b/source/d/python/python.x86_64.diff @@ -1,11 +1,108 @@ ---- ./Makefile.pre.in.orig 2010-08-01 17:05:31.000000000 -0500 -+++ ./Makefile.pre.in 2010-11-27 17:22:05.000000000 -0600 -@@ -87,11 +87,11 @@ +diff -uar Python-2.7.2.orig/Lib/distutils/command/install.py Python-2.7.2/Lib/distutils/command/install.py +--- Python-2.7.2.orig/Lib/distutils/command/install.py 2011-06-11 18:46:24.000000000 +0300 ++++ Python-2.7.2/Lib/distutils/command/install.py 2011-06-13 12:29:32.239106481 +0300 +@@ -41,15 +41,15 @@ - # Expanded directories - BINDIR= @bindir@ --LIBDIR= @libdir@ -+LIBDIR= $(exec_prefix)/lib64 + INSTALL_SCHEMES = { + 'unix_prefix': { +- 'purelib': '$base/lib/python$py_version_short/site-packages', +- 'platlib': '$platbase/lib/python$py_version_short/site-packages', ++ 'purelib': '$base/lib64/python$py_version_short/site-packages', ++ 'platlib': '$platbase/lib64/python$py_version_short/site-packages', + 'headers': '$base/include/python$py_version_short/$dist_name', + 'scripts': '$base/bin', + 'data' : '$base', + }, + 'unix_home': { +- 'purelib': '$base/lib/python', +- 'platlib': '$base/lib/python', ++ 'purelib': '$base/lib64/python', ++ 'platlib': '$base/lib64/python', + 'headers': '$base/include/python/$dist_name', + 'scripts': '$base/bin', + 'data' : '$base', +diff -uar Python-2.7.2.orig/Lib/distutils/sysconfig.py Python-2.7.2/Lib/distutils/sysconfig.py +--- Python-2.7.2.orig/Lib/distutils/sysconfig.py 2011-06-11 18:46:24.000000000 +0300 ++++ Python-2.7.2/Lib/distutils/sysconfig.py 2011-06-13 12:29:32.239106481 +0300 +@@ -115,7 +115,7 @@ + + if os.name == "posix": + libpython = os.path.join(prefix, +- "lib", "python" + get_python_version()) ++ "lib64", "python" + get_python_version()) + if standard_lib: + return libpython + else: +diff -uar Python-2.7.2.orig/Lib/site.py Python-2.7.2/Lib/site.py +--- Python-2.7.2.orig/Lib/site.py 2011-06-11 18:46:25.000000000 +0300 ++++ Python-2.7.2/Lib/site.py 2011-06-13 12:29:32.239106481 +0300 +@@ -300,13 +300,13 @@ + if sys.platform in ('os2emx', 'riscos'): + sitepackages.append(os.path.join(prefix, "Lib", "site-packages")) + elif os.sep == '/': +- sitepackages.append(os.path.join(prefix, "lib", ++ sitepackages.append(os.path.join(prefix, "lib64", + "python" + sys.version[:3], + "site-packages")) + sitepackages.append(os.path.join(prefix, "lib", "site-python")) + else: + sitepackages.append(prefix) +- sitepackages.append(os.path.join(prefix, "lib", "site-packages")) ++ sitepackages.append(os.path.join(prefix, "lib64", "site-packages")) + if sys.platform == "darwin": + # for framework builds *only* we add the standard Apple + # locations. +diff -uar Python-2.7.2.orig/Lib/sysconfig.py Python-2.7.2/Lib/sysconfig.py +--- Python-2.7.2.orig/Lib/sysconfig.py 2011-06-11 18:46:25.000000000 +0300 ++++ Python-2.7.2/Lib/sysconfig.py 2011-06-13 12:29:32.240106474 +0300 +@@ -7,20 +7,20 @@ + + _INSTALL_SCHEMES = { + 'posix_prefix': { +- 'stdlib': '{base}/lib/python{py_version_short}', +- 'platstdlib': '{platbase}/lib/python{py_version_short}', +- 'purelib': '{base}/lib/python{py_version_short}/site-packages', +- 'platlib': '{platbase}/lib/python{py_version_short}/site-packages', ++ 'stdlib': '{base}/lib64/python{py_version_short}', ++ 'platstdlib': '{platbase}/lib64/python{py_version_short}', ++ 'purelib': '{base}/lib64/python{py_version_short}/site-packages', ++ 'platlib': '{platbase}/lib64/python{py_version_short}/site-packages', + 'include': '{base}/include/python{py_version_short}', + 'platinclude': '{platbase}/include/python{py_version_short}', + 'scripts': '{base}/bin', + 'data': '{base}', + }, + 'posix_home': { +- 'stdlib': '{base}/lib/python', +- 'platstdlib': '{base}/lib/python', +- 'purelib': '{base}/lib/python', +- 'platlib': '{base}/lib/python', ++ 'stdlib': '{base}/lib64/python', ++ 'platstdlib': '{base}/lib64/python', ++ 'purelib': '{base}/lib64/python', ++ 'platlib': '{base}/lib64/python', + 'include': '{base}/include/python', + 'platinclude': '{base}/include/python', + 'scripts': '{base}/bin', +@@ -65,10 +65,10 @@ + 'data' : '{userbase}', + }, + 'posix_user': { +- 'stdlib': '{userbase}/lib/python{py_version_short}', +- 'platstdlib': '{userbase}/lib/python{py_version_short}', +- 'purelib': '{userbase}/lib/python{py_version_short}/site-packages', +- 'platlib': '{userbase}/lib/python{py_version_short}/site-packages', ++ 'stdlib': '{userbase}/lib64/python{py_version_short}', ++ 'platstdlib': '{userbase}/lib64/python{py_version_short}', ++ 'purelib': '{userbase}/lib64/python{py_version_short}/site-packages', ++ 'platlib': '{userbase}/lib64/python{py_version_short}/site-packages', + 'include': '{userbase}/include/python{py_version_short}', + 'scripts': '{userbase}/bin', + 'data' : '{userbase}', +diff -uar Python-2.7.2.orig/Makefile.pre.in Python-2.7.2/Makefile.pre.in +--- Python-2.7.2.orig/Makefile.pre.in 2011-06-11 18:46:26.000000000 +0300 ++++ Python-2.7.2/Makefile.pre.in 2011-06-13 12:29:32.240106474 +0300 +@@ -97,7 +97,7 @@ MANDIR= @mandir@ INCLUDEDIR= @includedir@ CONFINCLUDEDIR= $(exec_prefix)/include @@ -14,8 +111,9 @@ # Detailed destination directories BINLIBDEST= $(LIBDIR)/python$(VERSION) ---- ./Modules/getpath.c.orig 2010-07-24 05:09:36.000000000 -0500 -+++ ./Modules/getpath.c 2010-11-27 17:23:13.000000000 -0600 +diff -uar Python-2.7.2.orig/Modules/getpath.c Python-2.7.2/Modules/getpath.c +--- Python-2.7.2.orig/Modules/getpath.c 2011-06-11 18:46:27.000000000 +0300 ++++ Python-2.7.2/Modules/getpath.c 2011-06-13 12:29:32.240106474 +0300 @@ -117,8 +117,8 @@ #endif @@ -36,7 +134,7 @@ static void reduce(char *dir) -@@ -524,7 +524,7 @@ +@@ -528,7 +528,7 @@ } else strncpy(zip_path, PREFIX, MAXPATHLEN); @@ -45,7 +143,7 @@ bufsz = strlen(zip_path); /* Replace "00" with version */ zip_path[bufsz - 6] = VERSION[0]; zip_path[bufsz - 5] = VERSION[2]; -@@ -534,7 +534,7 @@ +@@ -538,7 +538,7 @@ fprintf(stderr, "Could not find platform dependent libraries <exec_prefix>\n"); strncpy(exec_prefix, EXEC_PREFIX, MAXPATHLEN); @@ -54,44 +152,25 @@ } /* If we found EXEC_PREFIX do *not* reduce it! (Yet.) */ ---- ./Modules/Setup.dist.orig 2008-11-27 04:15:12.000000000 -0600 -+++ ./Modules/Setup.dist 2010-11-27 17:21:23.000000000 -0600 -@@ -414,7 +414,7 @@ - #DB=/usr/local/BerkeleyDB.4.0 - #DBLIBVER=4.0 - #DBINC=$(DB)/include --#DBLIB=$(DB)/lib -+#DBLIB=$(DB)/lib64 - #_bsddb _bsddb.c -I$(DBINC) -L$(DBLIB) -ldb-$(DBLIBVER) - - # Historical Berkeley DB 1.85 -@@ -460,7 +460,7 @@ - # Andrew Kuchling's zlib module. - # This require zlib 1.1.3 (or later). - # See http://www.gzip.org/zlib/ --#zlib zlibmodule.c -I$(prefix)/include -L$(exec_prefix)/lib -lz -+#zlib zlibmodule.c -I$(prefix)/include -L$(exec_prefix)/lib64 -lz - - # Interface to the Expat XML parser - # ---- ./setup.py.orig 2010-07-17 07:31:09.000000000 -0500 -+++ ./setup.py 2010-11-27 17:21:23.000000000 -0600 -@@ -356,7 +356,7 @@ +diff -uar Python-2.7.2.orig/setup.py Python-2.7.2/setup.py +--- Python-2.7.2.orig/setup.py 2011-06-11 18:46:28.000000000 +0300 ++++ Python-2.7.2/setup.py 2011-06-13 12:29:32.241106466 +0300 +@@ -369,7 +369,7 @@ def detect_modules(self): # Ensure that /usr/local is always used - add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib') + add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib64') add_dir_to_list(self.compiler.include_dirs, '/usr/local/include') + self.add_multiarch_paths() - # Add paths specified in the environment variables LDFLAGS and -@@ -662,11 +662,11 @@ +@@ -677,11 +677,11 @@ elif curses_library: readline_libs.append(curses_library) elif self.compiler.find_library_file(lib_dirs + -- ['/usr/lib/termcap'], -+ ['/usr/lib64/termcap'], - 'termcap'): +- ['/usr/lib/termcap'], ++ ['/usr/lib64/termcap'], + 'termcap'): readline_libs.append('termcap') exts.append( Extension('readline', ['readline.c'], - library_dirs=['/usr/lib/termcap'], @@ -99,7 +178,7 @@ extra_link_args=readline_extra_link_args, libraries=readline_libs) ) else: -@@ -703,8 +703,8 @@ +@@ -715,8 +715,8 @@ if krb5_h: ssl_incs += krb5_h ssl_libs = find_library_file(self.compiler, 'ssl',lib_dirs, @@ -110,57 +189,3 @@ ] ) if (ssl_incs is not None and ---- ./Lib/distutils/command/install.py.orig 2008-05-06 17:41:46.000000000 -0500 -+++ ./Lib/distutils/command/install.py 2010-11-27 17:21:23.000000000 -0600 -@@ -42,14 +42,14 @@ - INSTALL_SCHEMES = { - 'unix_prefix': { - 'purelib': '$base/lib/python$py_version_short/site-packages', -- 'platlib': '$platbase/lib/python$py_version_short/site-packages', -+ 'platlib': '$platbase/lib64/python$py_version_short/site-packages', - 'headers': '$base/include/python$py_version_short/$dist_name', - 'scripts': '$base/bin', - 'data' : '$base', - }, - 'unix_home': { - 'purelib': '$base/lib/python', -- 'platlib': '$base/lib/python', -+ 'platlib': '$base/lib64/python', - 'headers': '$base/include/python/$dist_name', - 'scripts': '$base/bin', - 'data' : '$base', ---- ./Lib/distutils/sysconfig.py.orig 2010-08-03 16:18:06.000000000 -0500 -+++ ./Lib/distutils/sysconfig.py 2010-11-27 17:21:23.000000000 -0600 -@@ -119,8 +119,12 @@ - prefix = plat_specific and EXEC_PREFIX or PREFIX - - if os.name == "posix": -+ if plat_specific or standard_lib: -+ lib = "lib64" -+ else: -+ lib = "lib" - libpython = os.path.join(prefix, -- "lib", "python" + get_python_version()) -+ lib, "python" + get_python_version()) - if standard_lib: - return libpython - else: ---- ./Lib/site.py.orig 2010-03-21 09:02:32.000000000 -0500 -+++ ./Lib/site.py 2010-11-27 17:21:23.000000000 -0600 -@@ -265,12 +265,16 @@ - if sys.platform in ('os2emx', 'riscos'): - sitedirs.append(os.path.join(prefix, "Lib", "site-packages")) - elif os.sep == '/': -+ sitedirs.append(os.path.join(prefix, "lib64", -+ "python" + sys.version[:3], -+ "site-packages")) - sitedirs.append(os.path.join(prefix, "lib", - "python" + sys.version[:3], - "site-packages")) - sitedirs.append(os.path.join(prefix, "lib", "site-python")) - else: - sitedirs.append(prefix) -+ sitedirs.append(os.path.join(prefix, "lib64", "site-packages")) - sitedirs.append(os.path.join(prefix, "lib", "site-packages")) - - if sys.platform == "darwin": diff --git a/source/d/ruby/ruby.SlackBuild b/source/d/ruby/ruby.SlackBuild index c9a25654..3c856604 100755 --- a/source/d/ruby/ruby.SlackBuild +++ b/source/d/ruby/ruby.SlackBuild @@ -23,7 +23,7 @@ PKGNAM=ruby VERSION=$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1,2 -d - | rev) -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then @@ -87,26 +87,12 @@ optflags=$OPTFLAGS \ --docdir=/usr/doc/ruby-$VERSION \ --enable-shared \ --enable-pthread \ - --enable-install-doc \ + --disable-install-doc \ --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* ChangeLog LEGAL NEWS README* ToDo \ diff --git a/source/d/slacktrack/slacktrack.SlackBuild b/source/d/slacktrack/slacktrack.SlackBuild index 50d52ca0..3b62823a 100755 --- a/source/d/slacktrack/slacktrack.SlackBuild +++ b/source/d/slacktrack/slacktrack.SlackBuild @@ -5,15 +5,15 @@ if [ "$TMP" = "" ]; then TMP=/tmp fi -export VERSION=2.08 +export VERSION=2.12 if [ ! -d $TMP ]; then mkdir -p $TMP # location to build the source fi cd $TMP -rm -rf slacktrack +rm -rf slacktrack-project tar xvf $CWD/slacktrack-$VERSION-source.tar.xz -cd slacktrack || exit 1 +cd slacktrack-project || exit 1 # Start the "real" SlackBuild: ./slacktrack.SlackBuild diff --git a/source/d/subversion/get-svn-book.sh b/source/d/subversion/get-svn-book.sh index 112ba17c..e88530d3 100755 --- a/source/d/subversion/get-svn-book.sh +++ b/source/d/subversion/get-svn-book.sh @@ -3,7 +3,7 @@ CWD=`pwd` # Add the latest copy of the Subversion book: ( cd $CWD - lftpget http://svnbook.red-bean.com/nightly/en/svn-book-html.tar.bz2 + lftpget http://svnbook.red-bean.com/en/1.7/svn-book-html.tar.bz2 chmod 644 svn-book-html.tar.bz2 ) diff --git a/source/d/subversion/subversion.SlackBuild b/source/d/subversion/subversion.SlackBuild index 27f52fd8..114b1197 100755 --- a/source/d/subversion/subversion.SlackBuild +++ b/source/d/subversion/subversion.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2008, 2009, 2010, 2011 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2008, 2009, 2010, 2011, 2012 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -79,16 +79,20 @@ CFLAGS="$SLKCFLAGS" \ --disable-static \ --with-apr=/usr \ --with-apr-util=/usr \ - --with-apxs=/usr/sbin/apxs \ + --with-apxs=/usr/bin/apxs \ --with-neon=/usr \ --with-zlib=/usr \ --with-pic \ --with-ssl \ - --with-kwallet \ --build=$ARCH-slackware-linux +# Not currently compiling with gcc-4.7.1, but we'll try it again later: +# --with-kwallet \ +# + make $NUMJOBS || make || exit 1 make install DESTDIR=$PKG || exit 1 +make install-tools DESTDIR=$PKG || exit 1 make install-docs DESTDIR=$PKG || exit 1 # Install python bindings diff --git a/source/d/swig/swig.SlackBuild b/source/d/swig/swig.SlackBuild index aa4ea374..b786073f 100755 --- a/source/d/swig/swig.SlackBuild +++ b/source/d/swig/swig.SlackBuild @@ -23,7 +23,7 @@ PKGNAM=swig VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-2} +BUILD=${BUILD:-1} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then @@ -55,7 +55,7 @@ rm -rf $PKG mkdir -p $TMP $PKG cd $TMP rm -rf swig-$VERSION -tar xvf $CWD/swig-$VERSION.tar.bz2 +tar xvf $CWD/swig-$VERSION.tar.?z* || exit 1 cd swig-$VERSION chown -R root:root . find . \ @@ -72,10 +72,10 @@ CXXFLAGS="$SLKCFLAGS" \ --exec-prefix=/usr \ --sysconfdir=/etc \ --localstatedir=/var \ - --build=$ARCH-slackware-linux + --build=$ARCH-slackware-linux || exit 1 make $NUMJOBS || make || exit 1 -make install DESTDIR=$PKG +make install DESTDIR=$PKG || exit 1 ( cd $PKG find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | \ diff --git a/source/d/yasm/yasm.SlackBuild b/source/d/yasm/yasm.SlackBuild index b178fdb4..e98878da 100755 --- a/source/d/yasm/yasm.SlackBuild +++ b/source/d/yasm/yasm.SlackBuild @@ -47,8 +47,8 @@ # ----------------------------------------------------------------------------- PKGNAM=yasm -VERSION=${VERSION:-1.1.0} -BUILD=${BUILD:-1} +VERSION=${VERSION:-1.2.0} +BUILD=${BUILD:-2} TAG=${TAG:-} # Automatically determine the architecture we're building on: |