public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

sqlite: split dev and bin outputs

Browse Source
This commit is contained in:
Vladimír Čunát
2015-10-13 22:30:30 +02:00
parent e25da7e5c8
commit 90d5e87862
11 changed files with 53 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

72
pkgs/development/perl-modules/DBD-SQLite/external-sqlite.patch
View File

@@ -1,39 +1,33 @@
diff -rc DBD-SQLite-1.29/Makefile.PL DBD-SQLite-1.29-new/Makefile.PL
*** DBD-SQLite-1.29/Makefile.PL 2010-01-08 10:08:29.000000000 +0100
--- DBD-SQLite-1.29-new/Makefile.PL 2010-08-05 11:42:53.000000000 +0200
***************
*** 123,129 ****
# a system sqlite is also sophisticated enough to have a patching system
# that can change the if ( 0 ) to if ( 1 )
my ($sqlite_local, $sqlite_base, $sqlite_lib, $sqlite_inc);
! if ( 0 ) {
require File::Spec;
if ( $sqlite_base = (grep(/SQLITE_LOCATION=.*/, @ARGV))[0] ) {
$sqlite_base =~ /=(.*)/;
--- 123,129 ----
# a system sqlite is also sophisticated enough to have a patching system
# that can change the if ( 0 ) to if ( 1 )
my ($sqlite_local, $sqlite_base, $sqlite_lib, $sqlite_inc);
! if ( 1 ) {
require File::Spec;
if ( $sqlite_base = (grep(/SQLITE_LOCATION=.*/, @ARGV))[0] ) {
$sqlite_base =~ /=(.*)/;
***************
*** 184,191 ****
} else {
# Always the bundled one.
# XXX: ... and this message should be more informative.
! $sqlite_local = 1;
! print "We're using the bundled sqlite library.\n" if $ENV{AUTOMATED_TESTING};
}
@ARGV = grep( ! /SQLITE_LOCATION|USE_LOCAL_SQLITE/, @ARGV );
--- 184,191 ----
} else {
# Always the bundled one.
# XXX: ... and this message should be more informative.
! # $sqlite_local = 1;
! # print "We're using the bundled sqlite library.\n" if $ENV{AUTOMATED_TESTING};
}
@ARGV = grep( ! /SQLITE_LOCATION|USE_LOCAL_SQLITE/, @ARGV );
diff --git a/Makefile.PL b/Makefile.PL
index 606b28d..0cea060 100644
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -128,24 +128,10 @@ SCOPE: {
# the system SQLite. We expect that anyone sophisticated enough to use
# a system sqlite is also sophisticated enough to have a patching system
# that can change the if ( 0 ) to if ( 1 )
-my ($sqlite_local, $sqlite_base, $sqlite_lib, $sqlite_inc);
-if ( 0 ) {
- require File::Spec;
- if ( $sqlite_base = (grep(/SQLITE_LOCATION=.*/, @ARGV))[0] ) {
- $sqlite_base =~ /=(.*)/;
- $sqlite_base = $1;
- $sqlite_lib = File::Spec->catdir( $sqlite_base, 'lib' );
- $sqlite_inc = File::Spec->catdir( $sqlite_base, 'include' );
- }
- if ( $sqlite_local = (grep(/USE_LOCAL_SQLITE=.*/, @ARGV))[0] ) {
- $sqlite_local =~ /=(.*)/;
- $sqlite_local = "$1" ? 1 : 0;
- if ( $sqlite_local ) {
- # Keep these from making into CFLAGS/LDFLAGS
- undef $sqlite_lib;
- undef $sqlite_inc;
- }
- }
+my ($sqlite_local, $sqlite_lib, $sqlite_inc);
+if ( 1 ) {
+ $sqlite_lib = '@sqlite_out@/lib';
+ $sqlite_inc = '@sqlite_dev@/include';
# Now check for a compatible sqlite3
unless ( $sqlite_local ) {