From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([69.77.167.62] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1L0sCE-0000aU-Gg for garchives@archives.gentoo.org; Fri, 14 Nov 2008 06:30:22 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id DCC09E01E2; Fri, 14 Nov 2008 06:30:22 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 8F06BE01E2 for ; Fri, 14 Nov 2008 06:30:22 +0000 (UTC) Received: from stork.gentoo.org (stork.gentoo.org [64.127.104.133]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTP id 998AD644B9 for ; Fri, 14 Nov 2008 06:30:20 +0000 (UTC) Received: from robbat2 by stork.gentoo.org with local (Exim 4.69) (envelope-from ) id 1L0sCC-0008Sv-AE for gentoo-commits@lists.gentoo.org; Fri, 14 Nov 2008 06:30:20 +0000 From: "Robin H. Johnson (robbat2)" To: gentoo-commits@lists.gentoo.org Reply-To: gentoo-dev@lists.gentoo.org, robbat2@gentoo.org Subject: [gentoo-commits] gentoo-x86 commit in dev-db/mysql-super-smack/files: mysql-super-smack-1.3-gen-data.patch mysql-super-smack-1.3.gcc4.3.patch X-VCS-Repository: gentoo-x86 X-VCS-Files: mysql-super-smack-1.3-gen-data.patch mysql-super-smack-1.3.gcc4.3.patch X-VCS-Directories: dev-db/mysql-super-smack/files X-VCS-Committer: robbat2 X-VCS-Committer-Name: Robin H. Johnson Content-Type: text/plain; charset=utf8 Message-Id: Sender: "Robin H. Johnson" Date: Fri, 14 Nov 2008 06:30:20 +0000 Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: 2e7a886c-4a1d-4e65-ac6d-f908000dc2f3 X-Archives-Hash: 8e9d165bd9e29a0a23f9cb1fec137fc7 robbat2 08/11/14 06:30:20 Added: mysql-super-smack-1.3-gen-data.patch mysql-super-smack-1.3.gcc4.3.patch Log: Bug #245090 - fix for GCC4.3. Bug #169538 - avoid binary filename colli= sions with gen-data, install as super-smack-gen-data instead. (Portage version: 2.2_rc14/cvs/Linux 2.6.28-rc3-00249-ga622cf6 x86_64) Revision Changes Path 1.1 dev-db/mysql-super-smack/files/mysql-super-smack-1.3= -gen-data.patch file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-db/mysql-super= -smack/files/mysql-super-smack-1.3-gen-data.patch?rev=3D1.1&view=3Dmarkup plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-db/mysql-super= -smack/files/mysql-super-smack-1.3-gen-data.patch?rev=3D1.1&content-type=3D= text/plain Index: mysql-super-smack-1.3-gen-data.patch =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D diff -Nuar super-smack-1.3.orig/smacks/select-key.smack super-smack-1.3/s= macks/select-key.smack --- super-smack-1.3.orig/smacks/select-key.smack 2005-05-30 03:04:38.0000= 00000 -0700 +++ super-smack-1.3/smacks/select-key.smack 2008-11-13 22:27:48.125627179= -0800 @@ -24,7 +24,7 @@ min_rows "90000"; // the table must have at least that many rows data_file "words.dat"; // if the table is empty, load the data from //this file - gen_data_file "gen-data -n 90000 -f %12-12s%n,%25-25s,%n,%d"; + gen_data_file "super-smack-gen-data -n 90000 -f %12-12s%n,%25-25s,%n,%= d"; // if the file above does not exist, generate it with the above shell co= mmand // you can replace this command with anything that prints comma-delimite= d // data to stdout, just make sure you have the right number of columns diff -Nuar super-smack-1.3.orig/smacks/update-select.smack super-smack-1.= 3/smacks/update-select.smack --- super-smack-1.3.orig/smacks/update-select.smack 2005-05-30 03:04:51.0= 00000000 -0700 +++ super-smack-1.3/smacks/update-select.smack 2008-11-13 22:27:45.070167= 829 -0800 @@ -24,7 +24,7 @@ min_rows "90000"; // the table must have at least that many rows data_file "words.dat"; // if the table is empty, load the data from //this file - gen_data_file "gen-data -n 90000 -f %12-12s%n,%25-25s,%n,%d"; + gen_data_file "super-smack-gen-data -n 90000 -f %12-12s%n,%25-25s,%n,%= d"; // if the file above does not exist, generate it with the above command } =20 diff -Nuar super-smack-1.3.orig/src/Makefile.am super-smack-1.3/src/Makef= ile.am --- super-smack-1.3.orig/src/Makefile.am 2001-02-24 03:44:30.000000000 -0= 800 +++ super-smack-1.3/src/Makefile.am 2008-11-13 22:27:37.693573246 -0800 @@ -19,7 +19,7 @@ INCLUDES =3D @MYSQL_INCLUDE@ @PGSQL_INCLUDE@ @ORACLE_INCLUDE@ =20 noinst_PROGRAMS=3Dtest-dictionary test-client test_tcp_client -bin_PROGRAMS=3Dsuper-smack gen-data +bin_PROGRAMS=3Dsuper-smack super-smack-gen-data test_dictionary_SOURCES=3Dtest-dictionary.cc \ dictionary.cc dictionary.h \ die.cc die.h \ @@ -57,7 +57,7 @@ tcp_client.h tcp_client.cc super_smack_LDADD =3D @MYSQL_LIB@ @PGSQL_LIB@ @ORACLE_LIB@ =20 -gen_data_SOURCES=3Dgen-data.cc die.cc die.h +super_smack_gen_data_SOURCES=3Dgen-data.cc die.cc die.h =20 # yacc needs to generate a y.tab.h YFLAGS =3D -d 1.1 dev-db/mysql-super-smack/files/mysql-super-smack-1.3= .gcc4.3.patch file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-db/mysql-super= -smack/files/mysql-super-smack-1.3.gcc4.3.patch?rev=3D1.1&view=3Dmarkup plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-db/mysql-super= -smack/files/mysql-super-smack-1.3.gcc4.3.patch?rev=3D1.1&content-type=3D= text/plain Index: mysql-super-smack-1.3.gcc4.3.patch =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- src/dictionary.h.orig 2008-10-31 19:12:51.000000000 +0100 +++ src/dictionary.h 2008-10-31 19:13:12.000000000 +0100 @@ -23,6 +23,7 @@ =20 #include #include +#include #include #include