Revert "perl-native: Update for userelocatableinc and non-shared libperl"
This reverts commit fe59ca31ac
.
This broke builds for various people as reported in the bugzilla and on the
mailing list so we're reverting the change until Tom has a chance to make it
work properly for 5.12 (5.10 seems to work differently).
The DEPENDS change is left in since that part was valid.
This commit is contained in:
parent
4c8f498624
commit
c7c4c6678b
|
@ -4,7 +4,7 @@ SECTION = "libs"
|
||||||
LICENSE = "Artistic|GPL"
|
LICENSE = "Artistic|GPL"
|
||||||
LIC_FILES_CHKSUM = "file://Copying;md5=2b4c6ffbcfcbdee469f02565f253d81a \
|
LIC_FILES_CHKSUM = "file://Copying;md5=2b4c6ffbcfcbdee469f02565f253d81a \
|
||||||
file://Artistic;md5=f921793d03cc6d63ec4b15e9be8fd3f8"
|
file://Artistic;md5=f921793d03cc6d63ec4b15e9be8fd3f8"
|
||||||
PR = "r3"
|
PR = "r4"
|
||||||
|
|
||||||
LIC_FILES_CHKSUM = "file://Copying;md5=2b4c6ffbcfcbdee469f02565f253d81a \
|
LIC_FILES_CHKSUM = "file://Copying;md5=2b4c6ffbcfcbdee469f02565f253d81a \
|
||||||
file://Artistic;md5=f921793d03cc6d63ec4b15e9be8fd3f8"
|
file://Artistic;md5=f921793d03cc6d63ec4b15e9be8fd3f8"
|
||||||
|
@ -28,21 +28,19 @@ do_configure () {
|
||||||
-Dcflags="${CFLAGS}" \
|
-Dcflags="${CFLAGS}" \
|
||||||
-Dldflags="${LDFLAGS}" \
|
-Dldflags="${LDFLAGS}" \
|
||||||
-Dcf_by="Open Embedded" \
|
-Dcf_by="Open Embedded" \
|
||||||
\
|
|
||||||
-Dprefix=${prefix} \
|
-Dprefix=${prefix} \
|
||||||
-Dvendorprefix=${prefix} \
|
-Dvendorprefix=${prefix} \
|
||||||
-Dvendorprefix=${prefix} \
|
-Dvendorprefix=${prefix} \
|
||||||
-Dsiteprefix=${prefix} \
|
-Dsiteprefix=${prefix} \
|
||||||
\
|
\
|
||||||
-Dprivlib=.../../lib/perl/${PV} \
|
-Dprivlib=${STAGING_LIBDIR}/perl/${PV} \
|
||||||
-Darchlib=.../../lib/perl/${PV} \
|
-Darchlib=${STAGING_LIBDIR}/perl/${PV} \
|
||||||
-Dvendorlib=.../../lib/perl/${PV} \
|
-Dvendorlib=${STAGING_LIBDIR}/perl/${PV} \
|
||||||
-Dvendorarch=.../../lib/perl/${PV} \
|
-Dvendorarch=${STAGING_LIBDIR}/perl/${PV} \
|
||||||
-Dsitelib=.../../lib/perl/${PV} \
|
-Dsitelib=${STAGING_LIBDIR}/perl/${PV} \
|
||||||
-Dsitearch=.../../lib/perl/${PV} \
|
-Dsitearch=${STAGING_LIBDIR}/perl/${PV} \
|
||||||
-Duserelocatableinc="y" \
|
|
||||||
\
|
\
|
||||||
-Uuseshrplib \
|
-Duseshrplib \
|
||||||
-Dusethreads \
|
-Dusethreads \
|
||||||
-Duseithreads \
|
-Duseithreads \
|
||||||
-Duselargefiles \
|
-Duselargefiles \
|
||||||
|
@ -90,12 +88,8 @@ do_install () {
|
||||||
install $i ${D}${libdir}/perl/${PV}/CORE
|
install $i ${D}${libdir}/perl/${PV}/CORE
|
||||||
done
|
done
|
||||||
|
|
||||||
# Make sure we use /usr/bin/env perl
|
create_wrapper ${D}${bindir}/perl PERL5LIB='$PERL5LIB:${STAGING_LIBDIR}/perl/5.12.2:${STAGING_LIBDIR}/perl/'
|
||||||
for PERLSCRIPT in `grep -rIEl '#!.*/perl' ${D}${bindir}`; do
|
|
||||||
sed -i -e '1s|^#!.*|#!/usr/bin/env perl|' $PERLSCRIPT
|
|
||||||
done
|
|
||||||
}
|
}
|
||||||
|
|
||||||
do_install_append_nylon() {
|
do_install_append_nylon() {
|
||||||
# get rid of definitions not supported by the gcc version we use for nylon...
|
# get rid of definitions not supported by the gcc version we use for nylon...
|
||||||
for i in ${D}${libdir}/perl/${PV}/Config_heavy.pl ${D}${libdir}/perl/config.sh; do
|
for i in ${D}${libdir}/perl/${PV}/Config_heavy.pl ${D}${libdir}/perl/config.sh; do
|
||||||
|
|
Loading…
Reference in New Issue