diff options
| author | Jo-Philipp Wich <jow@openwrt.org> | 2012-01-20 02:55:55 +0000 |
|---|---|---|
| committer | Jo-Philipp Wich <jow@openwrt.org> | 2012-01-20 02:55:55 +0000 |
| commit | 4174cdabde5cd39fdcde781c4090515fc1c1f020 (patch) | |
| tree | cab5fce8db4b9f81e8be81abf5e94068280164f5 /tools/automake | |
| parent | aa8f9171f2e779040d655db2cf96234b6e98610c (diff) | |
| download | openwrt-4174cdabde5cd39fdcde781c4090515fc1c1f020.tar.gz openwrt-4174cdabde5cd39fdcde781c4090515fc1c1f020.tar.bz2 openwrt-4174cdabde5cd39fdcde781c4090515fc1c1f020.zip | |
automake: make relocatable by searching resources relative to STAGING_DIR
SVN-Revision: 29820
Diffstat (limited to 'tools/automake')
| -rw-r--r-- | tools/automake/patches/000-relocatable.patch | 35 |
1 files changed, 35 insertions, 0 deletions
diff --git a/tools/automake/patches/000-relocatable.patch b/tools/automake/patches/000-relocatable.patch new file mode 100644 index 0000000000..36a56c00fe --- /dev/null +++ b/tools/automake/patches/000-relocatable.patch @@ -0,0 +1,35 @@ +--- a/aclocal.in ++++ b/aclocal.in +@@ -28,7 +28,8 @@ eval 'case $# in 0) exec @PERL@ -S "$0"; + + BEGIN + { +- my $perllibdir = $ENV{'perllibdir'} || '@datadir@/@PACKAGE@-@APIVERSION@'; ++ my $perllibdir = $ENV{'perllibdir'} || ++ ($ENV{'STAGING_DIR'} ? $ENV{'STAGING_DIR'} . '/../host/share/@PACKAGE@-@APIVERSION@' : '@datadir@/@PACKAGE@-@APIVERSION@'); + unshift @INC, (split '@PATH_SEPARATOR@', $perllibdir); + } + +--- a/automake.in ++++ b/automake.in +@@ -31,7 +31,8 @@ package Language; + + BEGIN + { +- my $perllibdir = $ENV{'perllibdir'} || '@datadir@/@PACKAGE@-@APIVERSION@'; ++ my $perllibdir = $ENV{'perllibdir'} || ++ ($ENV{'STAGING_DIR'} ? $ENV{'STAGING_DIR'} . '/../host/share/@PACKAGE@-@APIVERSION@' : '@datadir@/@PACKAGE@-@APIVERSION@'); + unshift @INC, (split '@PATH_SEPARATOR@', $perllibdir); + + # Override SHELL. This is required on DJGPP so that system() uses +--- a/lib/Automake/Config.in ++++ b/lib/Automake/Config.in +@@ -28,7 +28,7 @@ our @EXPORT = qw ($APIVERSION $PACKAGE $ + our $APIVERSION = '@APIVERSION@'; + our $PACKAGE = '@PACKAGE@'; + our $VERSION = '@VERSION@'; +-our $libdir = '@datadir@/@PACKAGE@-@APIVERSION@'; ++our $libdir = $ENV{'STAGING_DIR'} ? $ENV{'STAGING_DIR'} . '/../host/share/@PACKAGE@-@APIVERSION@' : '@datadir@/@PACKAGE@-@APIVERSION@'; + our $perl_threads = @PERL_THREADS@; + + 1;; |