Re: emacs and strip

[Peter Valchev <pvalchev_(_at_)_sightly_(_dot_)_net>]

Nobody tested this?

I just committed it, and guess what, if it breaks - why should I care,
when nobody cares enough to test a simple diff?


> Date: Tue, 3 Aug 2004 13:30:31 -0600
> From: Peter Valchev <pvalchev_(_at_)_sightly_(_dot_)_net>
> To: ports_(_at_)_openbsd_(_dot_)_org
> Subject: emacs and strip
> Message-ID: <20040803193031_(_dot_)_GA6871_(_at_)_beryl_(_dot_)_sightly_(_dot_)_net>
> Mail-Followup-To: ports_(_at_)_openbsd_(_dot_)_org
> User-Agent: Mutt/1.4.2i
> 
> Per Marc's discovery, emacs did not work on sparc due to the strip
> problem.  The old emacs20 port had stripping disabled for the same
> reason on alpha, but this generally applies to more architectures for
> unknown reasons.  The recommended way is to strip temacs before creating
> emacs, and then just leaving it like that, which is what this patch
> does.
> 
> Can people test this on more arhitectures just in case?  It seems to
> start up on sparc.
> 
> I guess a PKGNAME bump will also be in order..
> 
> Index: patches/patch-Makefile_in
> ===================================================================
> RCS file: patches/patch-Makefile_in
> diff -N patches/patch-Makefile_in
> --- /dev/null	1 Jan 1970 00:00:00 -0000
> +++ patches/patch-Makefile_in	3 Aug 2004 08:16:51 -0000
> @@ -0,0 +1,12 @@
> +$OpenBSD$
> +--- Makefile.in.orig	Tue Aug  3 02:14:28 2004
> ++++ Makefile.in	Tue Aug  3 02:15:39 2004
> +@@ -328,7 +328,7 @@ install-arch-dep: mkdir
> + 	    exec_prefix=${exec_prefix} bindir=${bindir} \
> + 	    libexecdir=${libexecdir} archlibdir=${archlibdir} \
> + 	    INSTALL_STRIP=${INSTALL_STRIP})
> +-	${INSTALL_PROGRAM} $(INSTALL_STRIP) src/emacs ${bindir}/emacs-${version}
> ++	${INSTALL_PROGRAM} src/emacs ${bindir}/emacs-${version}
> + 	-chmod 1755  ${bindir}/emacs-${version}
> + 	rm -f ${bindir}/$(EMACS)
> + 	-ln ${bindir}/emacs-${version} ${bindir}/$(EMACS)
> Index: patches/patch-src_Makefile_in
> ===================================================================
> RCS file: /cvs/ports/editors/emacs21/patches/patch-src_Makefile_in,v
> retrieving revision 1.1
> diff -u -r1.1 patch-src_Makefile_in
> --- patches/patch-src_Makefile_in	19 Nov 2003 15:10:09 -0000	1.1
> +++ patches/patch-src_Makefile_in	3 Aug 2004 18:22:47 -0000
> @@ -1,7 +1,15 @@
>  $OpenBSD: patch-src_Makefile_in,v 1.1 2003/11/19 15:10:09 naddy Exp $
> ---- src/Makefile.in.orig	2003-11-19 15:12:49.000000000 +0100
> -+++ src/Makefile.in	2003-11-19 15:14:07.000000000 +0100
> -@@ -904,8 +904,6 @@ stamp-oldxmenu: ${OLDXMENU} ../src/$(OLD
> +--- src/Makefile.in.orig	Thu Jan 23 03:34:06 2003
> ++++ src/Makefile.in	Tue Aug  3 12:22:29 2004
> +@@ -875,6 +875,7 @@ temacs: MAKE_PARALLEL $(LOCALCPP) $(STAR
> + 	$(LD) YMF_PASS_LDFLAGS (${STARTFLAGS} ${ALL_LDFLAGS}) \
> +     -o temacs ${STARTFILES} ${obj} ${otherobj}  \
> +     OBJECTS_MACHINE ${LIBES}
> ++	strip temacs
> + 
> + /* We don't use ALL_LDFLAGS because LD_SWITCH_SYSTEM and LD_SWITCH_MACHINE
> +    often contain options that have to do with using Emacs's crt0,
> +@@ -904,8 +905,6 @@ stamp-oldxmenu: ${OLDXMENU} ../src/$(OLD
>   ../src/$(OLDXMENU): ${OLDXMENU}
>   
>   #ifdef USE_X_TOOLKIT
> @@ -10,7 +18,7 @@
>   /* Encode the values of these two macros in Make variables,
>      so we can use $(...) to substitute their values within "...".  */
>   C_SWITCH_MACHINE_1 = C_SWITCH_MACHINE
> -@@ -914,7 +912,7 @@ C_SWITCH_SITE_1 = C_SWITCH_SITE
> +@@ -914,7 +913,7 @@ C_SWITCH_SITE_1 = C_SWITCH_SITE
>   C_SWITCH_X_SITE_1 = C_SWITCH_X_SITE
>   C_SWITCH_X_MACHINE_1 = C_SWITCH_X_MACHINE
>   C_SWITCH_X_SYSTEM_1 = C_SWITCH_X_SYSTEM
> @@ -19,7 +27,7 @@
>   	cd ${lwlibdir}; ${MAKE} ${MFLAGS} LWLIB_OPTIONS \
>       CC='${CC}' CFLAGS='${CFLAGS}' MAKE='${MAKE}' \
>       "C_SWITCH_X_SITE=$(C_SWITCH_X_SITE_1)" \
> -@@ -923,11 +921,7 @@ really-lwlib:
> +@@ -923,11 +922,7 @@ really-lwlib:
>       "C_SWITCH_SITE=$(C_SWITCH_SITE_1)" \
>       "C_SWITCH_MACHINE=$(C_SWITCH_MACHINE_1)" \
>       "C_SWITCH_SYSTEM=$(C_SWITCH_SYSTEM_1)"
> @@ -31,7 +39,7 @@
>   /* Encode the values of these two macros in Make variables,
>      so we can use $(...) to substitute their values within "...".  */
>   C_SWITCH_MACHINE_1 = C_SWITCH_MACHINE
> -@@ -936,7 +930,7 @@ C_SWITCH_SITE_1 = C_SWITCH_SITE
> +@@ -936,7 +931,7 @@ C_SWITCH_SITE_1 = C_SWITCH_SITE
>   C_SWITCH_X_SITE_1 = C_SWITCH_X_SITE
>   C_SWITCH_X_MACHINE_1 = C_SWITCH_X_MACHINE
>   C_SWITCH_X_SYSTEM_1 = C_SWITCH_X_SYSTEM
> @@ -40,7 +48,7 @@
>   	cd ${oldXMenudir}; ${MAKE} ${MFLAGS} OLDXMENU_OPTIONS \
>       CC='${CC}' CFLAGS='${CFLAGS}' MAKE='${MAKE}' \
>       "C_SWITCH_X_SITE=$(C_SWITCH_X_SITE_1)" \
> -@@ -945,8 +939,6 @@ really-oldXMenu:
> +@@ -945,8 +940,6 @@ really-oldXMenu:
>       "C_SWITCH_SITE=$(C_SWITCH_SITE_1)" \
>       "C_SWITCH_MACHINE=$(C_SWITCH_MACHINE_1)" \
>       "C_SWITCH_SYSTEM=$(C_SWITCH_SYSTEM_1)"