Date: Sun, 16 Oct 2005 19:58:30 +0200 (CEST) From: Simun Mikecin <numisemis@yahoo.com> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/87525: [fix] misc/compat4x: amd64 unsupported Message-ID: <20051016175830.2AE0660083@data.home.hr> Resent-Message-ID: <200510161800.j9GI0Kjm075008@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 87525
>Category: ports
>Synopsis: [fix] misc/compat4x: amd64 unsupported
>Confidential: no
>Severity: critical
>Priority: high
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: sw-bug
>Submitter-Id: current-users
>Arrival-Date: Sun Oct 16 18:00:20 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator: Simun Mikecin
>Release: FreeBSD 6.0-RC1 amd64
>Organization:
>Environment:
System: FreeBSD data.home.hr 6.0-RC1 FreeBSD 6.0-RC1 #4: Sun Oct 16 16:47:10 CEST 2005 root@:/var/obj/usr/src/sys/DATA amd64
>Description:
Added support for installing i386 4.x libraries on the amd64 architecture.
It is done like in the misc/compat5x port putting libs in the
${PREFIX}/lib32/compat directory.
With this commit, PR amd64/76176 should be closed.
>How-To-Repeat:
Try to install this port on the FreeBSD/amd64:
cd /usr/ports/misc/compat4x && make install
>Fix:
--- Makefile.orig Wed Oct 5 14:13:54 2005
+++ Makefile Sun Oct 16 19:47:24 2005
@@ -35,9 +35,17 @@
COMPAT4X_OSVERSION= 5.3
PLIST= ${.CURDIR}/pkg-plist.freebsd5
.if ${ARCH} == i386
+PLIST_SUB+= LIBDIR="lib"
+COMPAT4X_DISTFILES= ${PORTNAME}.aa \
+ ${PORTNAME}.ab
+.elif ${ARCH} == amd64
+ARCH= i386
+TARGET_DIR= ${PREFIX}/lib32/compat
+PLIST_SUB+= LIBDIR="lib32"
COMPAT4X_DISTFILES= ${PORTNAME}.aa \
${PORTNAME}.ab
.elif ${ARCH} == alpha
+PLIST_SUB+= LIBDIR="lib"
COMPAT4X_DISTFILES= ${PORTNAME}.aa \
${PORTNAME}.ab
.else
@@ -109,6 +117,9 @@
do-build:
@( ${ECHO_CMD} '#!/bin/sh'; ${ECHO_CMD} '${LDCONFIG} -m ${LDCONFIG_RUNLIST}'; \
) > ${WRKDIR}/000.${PORTNAME}.sh
+.if ${TARGET_DIR} == ${PREFIX}/lib32/compat
+ @${ECHO_CMD} '${LDCONFIG} -32 -m ${TARGET_DIR}' >> ${WRKDIR}/000.${PORTNAME}.sh
+.endif
do-install:
${MKDIR} ${TARGET_DIR} ${PREFIX}/etc/rc.d
--- pkg-plist.freebsd5.orig Sat Oct 9 06:25:39 2004
+++ pkg-plist.freebsd5 Sun Oct 16 19:45:27 2005
@@ -1,41 +1,42 @@
etc/rc.d/000.compat4x.sh
-lib/compat/libc.so.4
+%%LIBDIR%%/compat/libc.so.4
@unexec if [ -e %B/libc_r.so.4.compat3x ]; then ln -sf libc_r.so.4.compat3x %B/libc_r.so.4; else rm %B/libc_r.so.4; fi
-lib/compat/libc_r.so.4.compat4x
+%%LIBDIR%%/compat/libc_r.so.4.compat4x
@exec ln -sf %f %B/libc_r.so.4
-%%FORBIDDEN:%%lib/compat/libcrypto.so.1
-%%FORBIDDEN:%%lib/compat/libcrypto.so.2
-lib/compat/libdevstat.so.2
-lib/compat/libedit.so.3
-lib/compat/libfetch.so.2
-lib/compat/libgmp.so.3
-lib/compat/libhistory.so.4
-lib/compat/libm.so.2
-lib/compat/libmp.so.3
-lib/compat/libopie.so.2
-lib/compat/libpam.so.1
-lib/compat/libpcap.so.2
+%%FORBIDDEN:%%%%LIBDIR%%/compat/libcrypto.so.1
+%%FORBIDDEN:%%%%LIBDIR%%/compat/libcrypto.so.2
+%%LIBDIR%%/compat/libdevstat.so.2
+%%LIBDIR%%/compat/libedit.so.3
+%%LIBDIR%%/compat/libfetch.so.2
+%%LIBDIR%%/compat/libgmp.so.3
+%%LIBDIR%%/compat/libhistory.so.4
+%%LIBDIR%%/compat/libm.so.2
+%%LIBDIR%%/compat/libmp.so.3
+%%LIBDIR%%/compat/libopie.so.2
+%%LIBDIR%%/compat/libpam.so.1
+%%LIBDIR%%/compat/libpcap.so.2
@unexec if [ -e %B/libperl.so.3.compat3x ]; then ln -sf libperl.so.3.compat3x %B/libperl.so.3; else rm %B/libperl.so.3; fi
-lib/compat/libperl.so.3.compat4x
+%%LIBDIR%%/compat/libperl.so.3.compat4x
@exec ln -sf %f %B/libperl.so.3
-lib/compat/libposix1e.so.2
-lib/compat/libreadline.so.4
-lib/compat/libskey.so.2
-%%FORBIDDEN:%%lib/compat/libssl.so.1
-%%FORBIDDEN:%%lib/compat/libssl.so.2
-lib/compat/libstdc++.so.3
-lib/compat/libusb.so.0
-lib/compat/libusbhid.so.0
-%%I386_ONLY%%lib/compat/libutil.so.3
-%%I386_ONLY%%lib/compat/libvgl.so.2
-lib/compat/pam_cleartext_pass_ok.so
-lib/compat/pam_deny.so
-lib/compat/pam_opie.so
-lib/compat/pam_opieaccess.so
-lib/compat/pam_permit.so
-lib/compat/pam_radius.so
-lib/compat/pam_skey.so
-lib/compat/pam_ssh.so
-lib/compat/pam_tacplus.so
-lib/compat/pam_unix.so
-@unexec rmdir %D/lib/compat 2>/dev/null || true
+%%LIBDIR%%/compat/libposix1e.so.2
+%%LIBDIR%%/compat/libreadline.so.4
+%%LIBDIR%%/compat/libskey.so.2
+%%FORBIDDEN:%%%%LIBDIR%%/compat/libssl.so.1
+%%FORBIDDEN:%%%%LIBDIR%%/compat/libssl.so.2
+%%LIBDIR%%/compat/libstdc++.so.3
+%%LIBDIR%%/compat/libusb.so.0
+%%LIBDIR%%/compat/libusbhid.so.0
+%%I386_ONLY%%%%LIBDIR%%/compat/libutil.so.3
+%%I386_ONLY%%%%LIBDIR%%/compat/libvgl.so.2
+%%LIBDIR%%/compat/pam_cleartext_pass_ok.so
+%%LIBDIR%%/compat/pam_deny.so
+%%LIBDIR%%/compat/pam_opie.so
+%%LIBDIR%%/compat/pam_opieaccess.so
+%%LIBDIR%%/compat/pam_permit.so
+%%LIBDIR%%/compat/pam_radius.so
+%%LIBDIR%%/compat/pam_skey.so
+%%LIBDIR%%/compat/pam_ssh.so
+%%LIBDIR%%/compat/pam_tacplus.so
+%%LIBDIR%%/compat/pam_unix.so
+@unexec rmdir %D/%%LIBDIR%%/compat 2>/dev/null || true
+@unexec rmdir %D/%%LIBDIR%% 2>/dev/null || true
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20051016175830.2AE0660083>