mirrors/meta-openembedded
1
0
Fork 0
mirror of https://github.com/openembedded/meta-openembedded.git synced 2026-07-16 16:27:27 +00:00
Code Issues Projects Releases Wiki Activity

apache2: fix multilib builds

Browse Source 
Change PN -> BPN in a number of places so that files are stored in the
correct location and packaged correctly.

Based on a patch by Song.Li <Song.Li@windriver.com> with additional
PN -> BPN replacements.

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
This commit is contained in:
Paul Eggleton
2013-04-22 09:35:40 +01:00
committed by Eric Bénard
parent 6cbeee1537
commit cca735e1eb
1 changed files with 33 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta-webserver/recipes-httpd/apache2/apache2_2.4.3.bb
+33 -34
View File
@@ -38,13 +38,13 @@ EXTRA_OECONF = "--enable-ssl \
--enable-rewrite \ --enable-rewrite \
--with-dbm=sdbm \ --with-dbm=sdbm \
--with-berkeley-db=no \ --with-berkeley-db=no \
--localstatedir=/var/${PN} \ --localstatedir=/var/${BPN} \
--with-gdbm=no \ --with-gdbm=no \
--with-ndbm=no \ --with-ndbm=no \
--includedir=${includedir}/${PN} \ --includedir=${includedir}/${BPN} \
--datadir=${datadir}/${PN} \ --datadir=${datadir}/${BPN} \
--sysconfdir=${sysconfdir}/${PN} \ --sysconfdir=${sysconfdir}/${BPN} \
--libexecdir=${libdir}/${PN}/modules \ --libexecdir=${libdir}/${BPN}/modules \
ap_cv_void_ptr_lt_long=no \ ap_cv_void_ptr_lt_long=no \
--enable-mpms-shared \ --enable-mpms-shared \
ac_cv_have_threadsafe_pollset=no" ac_cv_have_threadsafe_pollset=no"
@@ -65,19 +65,19 @@ do_install_append() {
-e 's,/usr/bin/,${bindir}/,g' \ -e 's,/usr/bin/,${bindir}/,g' \
-e 's,/usr/lib,${libdir}/,g' \ -e 's,/usr/lib,${libdir}/,g' \
-e 's,/etc/,${sysconfdir}/,g' \ -e 's,/etc/,${sysconfdir}/,g' \
-e 's,/usr/,${prefix}/,g' > ${D}/${sysconfdir}/init.d/${PN} -e 's,/usr/,${prefix}/,g' > ${D}/${sysconfdir}/init.d/${BPN}
chmod 755 ${D}/${sysconfdir}/init.d/${PN} chmod 755 ${D}/${sysconfdir}/init.d/${BPN}
# remove the goofy original files... # remove the goofy original files...
rm -rf ${D}/${sysconfdir}/${PN}/original rm -rf ${D}/${sysconfdir}/${BPN}/original
# Expat should be found in the staging area via DEPENDS... # Expat should be found in the staging area via DEPENDS...
rm -f ${D}/${libdir}/libexpat.* rm -f ${D}/${libdir}/libexpat.*
install -d ${D}${sysconfdir}/${PN}/conf.d install -d ${D}${sysconfdir}/${BPN}/conf.d
install -d ${D}${sysconfdir}/${PN}/modules.d install -d ${D}${sysconfdir}/${BPN}/modules.d
# Ensure configuration file pulls in conf.d and modules.d # Ensure configuration file pulls in conf.d and modules.d
printf "\nIncludeOptional ${sysconfdir}/${PN}/conf.d/*.conf" >> ${D}/${sysconfdir}/${PN}/httpd.conf printf "\nIncludeOptional ${sysconfdir}/${BPN}/conf.d/*.conf" >> ${D}/${sysconfdir}/${BPN}/httpd.conf
printf "\nIncludeOptional ${sysconfdir}/${PN}/modules.d/*.conf\n\n" >> ${D}/${sysconfdir}/${PN}/httpd.conf printf "\nIncludeOptional ${sysconfdir}/${BPN}/modules.d/*.conf\n\n" >> ${D}/${sysconfdir}/${BPN}/httpd.conf
} }
SYSROOT_PREPROCESS_FUNCS += "apache_sysroot_preprocess" SYSROOT_PREPROCESS_FUNCS += "apache_sysroot_preprocess"
@@ -85,12 +85,12 @@ SYSROOT_PREPROCESS_FUNCS += "apache_sysroot_preprocess"
apache_sysroot_preprocess () { apache_sysroot_preprocess () {
install -d ${SYSROOT_DESTDIR}${bindir_crossscripts}/ install -d ${SYSROOT_DESTDIR}${bindir_crossscripts}/
install -m 755 ${D}${bindir}/apxs ${SYSROOT_DESTDIR}${bindir_crossscripts}/ install -m 755 ${D}${bindir}/apxs ${SYSROOT_DESTDIR}${bindir_crossscripts}/
sed -i 's!my $installbuilddir = .*!my $installbuilddir = "${STAGING_DIR_HOST}/${datadir}/${PN}/build";!' ${SYSROOT_DESTDIR}${bindir_crossscripts}/apxs sed -i 's!my $installbuilddir = .*!my $installbuilddir = "${STAGING_DIR_HOST}/${datadir}/${BPN}/build";!' ${SYSROOT_DESTDIR}${bindir_crossscripts}/apxs
sed -i 's!my $libtool = .*!my $libtool = "${STAGING_BINDIR_CROSS}/${TARGET_PREFIX}libtool";!' ${SYSROOT_DESTDIR}${bindir_crossscripts}/apxs sed -i 's!my $libtool = .*!my $libtool = "${STAGING_BINDIR_CROSS}/${TARGET_PREFIX}libtool";!' ${SYSROOT_DESTDIR}${bindir_crossscripts}/apxs
sed -i 's!^APR_CONFIG = .*!APR_CONFIG = ${STAGING_BINDIR_CROSS}/apr-1-config!' ${SYSROOT_DESTDIR}${datadir}/${PN}/build/config_vars.mk sed -i 's!^APR_CONFIG = .*!APR_CONFIG = ${STAGING_BINDIR_CROSS}/apr-1-config!' ${SYSROOT_DESTDIR}${datadir}/${BPN}/build/config_vars.mk
sed -i 's!^APU_CONFIG = .*!APU_CONFIG = ${STAGING_BINDIR_CROSS}/apu-1-config!' ${SYSROOT_DESTDIR}${datadir}/${PN}/build/config_vars.mk sed -i 's!^APU_CONFIG = .*!APU_CONFIG = ${STAGING_BINDIR_CROSS}/apu-1-config!' ${SYSROOT_DESTDIR}${datadir}/${BPN}/build/config_vars.mk
sed -i 's!^includedir = .*!includedir = ${STAGING_INCDIR}/apache2!' ${SYSROOT_DESTDIR}${datadir}/${PN}/build/config_vars.mk sed -i 's!^includedir = .*!includedir = ${STAGING_INCDIR}/apache2!' ${SYSROOT_DESTDIR}${datadir}/${BPN}/build/config_vars.mk
} }
# #
@@ -102,40 +102,39 @@ LEAD_SONAME = "libapr-1.so.0"
PACKAGES = "${PN}-doc ${PN}-dev ${PN}-dbg ${PN}" PACKAGES = "${PN}-doc ${PN}-dev ${PN}-dbg ${PN}"
CONFFILES_${PN} = "${sysconfdir}/${PN}/httpd.conf \ CONFFILES_${PN} = "${sysconfdir}/${BPN}/httpd.conf \
${sysconfdir}/${PN}/magic \ ${sysconfdir}/${BPN}/magic \
${sysconfdir}/${PN}/mime.types \ ${sysconfdir}/${BPN}/mime.types \
${sysconfdir}/init.d/${PN} " ${sysconfdir}/init.d/${BPN} "
# we override here rather than append so that .so links are # we override here rather than append so that .so links are
# included in the runtime package rather than here (-dev) # included in the runtime package rather than here (-dev)
# and to get build, icons, error into the -dev package # and to get build, icons, error into the -dev package
FILES_${PN}-dev = "${datadir}/${PN}/build \ FILES_${PN}-dev = "${datadir}/${BPN}/build \
${datadir}/${PN}/icons \ ${datadir}/${BPN}/icons \
${datadir}/${PN}/error \ ${datadir}/${BPN}/error \
${bindir}/apr-config ${bindir}/apu-config \ ${bindir}/apr-config ${bindir}/apu-config \
${libdir}/apr*.exp \ ${libdir}/apr*.exp \
${includedir}/${PN} \ ${includedir}/${BPN} \
${libdir}/*.la \ ${libdir}/*.la \
${libdir}/*.a" ${libdir}/*.a"
# manual to manual # manual to manual
FILES_${PN}-doc += " ${datadir}/${PN}/manual" FILES_${PN}-doc += " ${datadir}/${BPN}/manual"
# #
# override this too - here is the default, less datadir # override this too - here is the default, less datadir
# #
FILES_${PN} = "${bindir} ${sbindir} ${libexecdir} ${libdir}/lib*.so.* ${sysconfdir} \ FILES_${PN} = "${bindir} ${sbindir} ${libexecdir} ${libdir}/lib*.so.* ${sysconfdir} \
${sharedstatedir} ${localstatedir} /bin /sbin /lib/*.so* \ ${sharedstatedir} ${localstatedir} /bin /sbin /lib/*.so* \
${libdir}/${PN}" ${libdir}/${BPN}"
# we want htdocs and cgi-bin to go with the binary # we want htdocs and cgi-bin to go with the binary
FILES_${PN} += "${datadir}/${PN}/htdocs ${datadir}/${PN}/cgi-bin" FILES_${PN} += "${datadir}/${BPN}/htdocs ${datadir}/${BPN}/cgi-bin"
#make sure the lone .so links also get wrapped in the base package #make sure the lone .so links also get wrapped in the base package
FILES_${PN} += "${libdir}/lib*.so ${libdir}/pkgconfig/*" FILES_${PN} += "${libdir}/lib*.so ${libdir}/pkgconfig/*"
FILES_${PN}-dbg += "${libdir}/${PN}/modules/.debug" FILES_${PN}-dbg += "${libdir}/${BPN}/modules/.debug"
RDEPENDS_${PN} += "openssl libgcc" RDEPENDS_${PN} += "openssl libgcc"