cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

No need to elf2olf static binaries anymore; ok sturm@ (maintainer)

Browse Source
This commit is contained in:
miod 2008-06-12 16:33:21 +00:00
parent 2ab389682e
commit cf240b3849
6 changed files with 15 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
emulators/fedora/base/Makefile
View File

@ -1,8 +1,8 @@
# $OpenBSD: Makefile,v 1.7 2007/09/16 00:45:13 merdely Exp $
# $OpenBSD: Makefile,v 1.8 2008/06/12 16:33:21 miod Exp $
COMMENT= Linux compatibility package based on Fedora Core 4
PKGNAME= fedora_base-4.0p3
PKGNAME= fedora_base-4.0p4
# clean up after make plist:
# - perl -pi -e "s,^\@lib ,," pkg/PLIST
# - change the 2nd LIBXaw_version to LIBXaw7_version in pkg/PLIST
@ -136,12 +136,10 @@ do-install:
cd ${FEDORADIR} && ${PATCH} -p0 --forward --quiet -E < \
${PATCHDIR}/patch-ldd
${INSTALL_DATA} ${FILESDIR}/ld.so.conf ${FEDORADIR}/etc
elf2olf -o linux ${FEDORADIR}/sbin/ldconfig
mv ${FEDORADIR}/sbin/ldconfig ${FEDORADIR}/sbin/ldconfig.bin
${INSTALL_SCRIPT} ${FILESDIR}/ldconfig ${FEDORADIR}/sbin
cp -p ${FEDORADIR}/lib/ld-2.3.6.so ${FEDORADIR}/usr/bin/ld-2.3.6-olf.so
elf2olf -o linux ${FEDORADIR}/usr/bin/ld-2.3.6-olf.so
perl ${FILESDIR}/fix-ldd.pl ${FEDORADIR}/usr/bin/ld-2.3.6-olf.so
cp -p ${FEDORADIR}/lib/ld-2.3.6.so ${FEDORADIR}/usr/bin/ld-2.3.6-elf.so
perl ${FILESDIR}/fix-ldd.pl ${FEDORADIR}/usr/bin/ld-2.3.6-elf.so
# need old linuxthreads libraries
rm ${FEDORADIR}/lib/libpthread*

2
emulators/fedora/base/patches/patch-ldd
View File

@ -5,7 +5,7 @@
TEXTDOMAINDIR=/usr/share/locale
-RTLDLIST=/lib/ld-linux.so.2
+RTLDLIST=/emul/linux/usr/bin/ld-2.3.6-olf.so
+RTLDLIST=/emul/linux/usr/bin/ld-2.3.6-elf.so
warn=
bind_now=
verbose=

4
emulators/fedora/base/pkg/PLIST
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.5 2007/03/30 14:27:24 espie Exp $
@comment $OpenBSD: PLIST,v 1.6 2008/06/12 16:33:23 miod Exp $
@conflict redhat_base-*
emul/
emul/fedora/
@ -492,7 +492,7 @@ emul/fedora/usr/bin/infocmp
emul/fedora/usr/bin/infotocap
emul/fedora/usr/bin/jpegtran
emul/fedora/usr/bin/ld
emul/fedora/usr/bin/ld-2.3.6-olf.so
emul/fedora/usr/bin/ld-2.3.6-elf.so
emul/fedora/usr/bin/ldd
@comment emul/fedora/usr/bin/ldd.orig
emul/fedora/usr/bin/lddlibc4

15
emulators/redhat/base/Makefile
View File

@ -1,8 +1,8 @@
# $OpenBSD: Makefile,v 1.28 2007/09/16 00:45:13 merdely Exp $
# $OpenBSD: Makefile,v 1.29 2008/06/12 16:33:23 miod Exp $
COMMENT= Linux compatibility package based on RedHat 8.0
PKGNAME= redhat_base-8.0p9
PKGNAME= redhat_base-8.0p10
MAINTAINER= Jason Ish <ish@openbsd.org>
@ -81,18 +81,13 @@ do-install:
# copy in ld.so.conf
${INSTALL_DATA} ${FILESDIR}/ld.so.conf ${PREFIX}/etc
# run elf2olf on a few binaries known not to run as elf
@elf2olf -o linux ${PREFIX}/sbin/ldconfig
@elf2olf -o linux ${PREFIX}/bin/rpm
# rename ldconfig and install wrapper
@cp -p ${PREFIX}/sbin/ldconfig ${PREFIX}/sbin/ldconfig.bin
${INSTALL_SCRIPT} ${FILESDIR}/ldconfig ${PREFIX}/sbin
# make a copy of ld.so, convert to olf and then patch
@cp -p ${PREFIX}/lib/ld-2.3.2.so ${PREFIX}/usr/bin/ld-2.3.2-olf.so
@elf2olf -o linux ${PREFIX}/usr/bin/ld-2.3.2-olf.so
@perl ${FILESDIR}/fix-ldd.pl ${PREFIX}/usr/bin/ld-2.3.2-olf.so
# make a copy of ld.so and patch
@cp -p ${PREFIX}/lib/ld-2.3.2.so ${PREFIX}/usr/bin/ld-2.3.2-elf.so
@perl ${FILESDIR}/fix-ldd.pl ${PREFIX}/usr/bin/ld-2.3.2-elf.so
post-install:
# remove setuid root bits

2
emulators/redhat/base/patches/patch-ldd
View File

@ -5,7 +5,7 @@
TEXTDOMAINDIR=/usr/share/locale
-RTLDLIST=/lib/ld-linux.so.2
+RTLDLIST=/emul/linux/usr/bin/ld-2.3.2-olf.so
+RTLDLIST=/emul/linux/usr/bin/ld-2.3.2-elf.so
warn=
bind_now=
verbose=

4
emulators/redhat/base/pkg/PLIST
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.14 2006/10/17 23:00:32 sturm Exp $
@comment $OpenBSD: PLIST,v 1.15 2008/06/12 16:33:23 miod Exp $
@conflict linux_lib-*
@sample /emul/
@sample ${PREFIX}/
@ -481,7 +481,7 @@ usr/bin/install
usr/bin/jpegtran
usr/bin/kill
usr/bin/ld
usr/bin/ld-2.3.2-olf.so
usr/bin/ld-2.3.2-elf.so
usr/bin/ldd
@comment usr/bin/ldd.orig
usr/bin/lddlibc4