Mon Nov 4 11:08:03 2013 UTC ()
Don't strip on older OSX, avoids 'malformed object' errors.


(jperkin)
diff -r1.6 -r1.7 pkgsrc/editors/emacs24/Makefile.common
cvs diff -r1.6 -r1.7 pkgsrc/editors/emacs24/Attic/Makefile.common (expand / switch to unified diff)

--- pkgsrc/editors/emacs24/Attic/Makefile.common 2013/10/27 20:47:53 1.6
+++ pkgsrc/editors/emacs24/Attic/Makefile.common 2013/11/04 11:08:03 1.7
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile.common,v 1.6 2013/10/27 20:47:53 joerg Exp $ 1# $NetBSD: Makefile.common,v 1.7 2013/11/04 11:08:03 jperkin Exp $
2# 2#
3# used by editors/emacs24/Makefile 3# used by editors/emacs24/Makefile
4# used by editors/emacs24-nox11/Makefile 4# used by editors/emacs24-nox11/Makefile
5 5
6DISTNAME= emacs-${EMACS_VERSION} 6DISTNAME= emacs-${EMACS_VERSION}
7PKGNAME?= ${DISTNAME:S/emacs/emacs24/} 7PKGNAME?= ${DISTNAME:S/emacs/emacs24/}
8CATEGORIES= editors 8CATEGORIES= editors
9MASTER_SITES= ${MASTER_SITE_GNU:=emacs/} 9MASTER_SITES= ${MASTER_SITE_GNU:=emacs/}
10 10
11MAINTAINER= pkgsrc-users@NetBSD.org 11MAINTAINER= pkgsrc-users@NetBSD.org
12HOMEPAGE= http://www.gnu.org/software/emacs/emacs.html 12HOMEPAGE= http://www.gnu.org/software/emacs/emacs.html
13COMMENT= GNU editing macros (editor) 13COMMENT= GNU editing macros (editor)
14LICENSE= gnu-gpl-v3 14LICENSE= gnu-gpl-v3
@@ -48,26 +48,30 @@ CONF_FILES_PERMS+= /dev/null ${VARBASE}/ @@ -48,26 +48,30 @@ CONF_FILES_PERMS+= /dev/null ${VARBASE}/
48SPECIAL_PERMS+= libexec/emacs/${EMACS_VERSION}/${MACHINE_GNU_PLATFORM}/update-game-score ${SETGID_GAMES_PERMS} 48SPECIAL_PERMS+= libexec/emacs/${EMACS_VERSION}/${MACHINE_GNU_PLATFORM}/update-game-score ${SETGID_GAMES_PERMS}
49 49
50# build PATH in the dumped emacs is not a problem 50# build PATH in the dumped emacs is not a problem
51CHECK_WRKREF_SKIP+= bin/emacs 51CHECK_WRKREF_SKIP+= bin/emacs
52CHECK_WRKREF_SKIP+= bin/emacs-${EMACS_VERSION} 52CHECK_WRKREF_SKIP+= bin/emacs-${EMACS_VERSION}
53 53
54.include "../../mk/bsd.prefs.mk" 54.include "../../mk/bsd.prefs.mk"
55 55
56.if (${OPSYS} == "Darwin") 56.if (${OPSYS} == "Darwin")
57# Disable address randomization to fix build with Xcode 4.1. This is from 57# Disable address randomization to fix build with Xcode 4.1. This is from
58# upstream bug #8395. Details in: 58# upstream bug #8395. Details in:
59# http://lists.gnu.org/archive/html/emacs-bug-tracker/2011-07/msg00445.html 59# http://lists.gnu.org/archive/html/emacs-bug-tracker/2011-07/msg00445.html
60CFLAGS+= -fno-pie 60CFLAGS+= -fno-pie
 61# Avoid 'malformed object' errors with older Xcode.
 62. if ${OS_VERSION:R} < 11
 63INSTALL_UNSTRIPPED= yes
 64. endif
61.endif 65.endif
62 66
63.if (${OPSYS} == "NetBSD") && \ 67.if (${OPSYS} == "NetBSD") && \
64 !exists(/usr/lib/libgcc_s.so) && !exists(/usr/lib/libgcc.a) 68 !exists(/usr/lib/libgcc_s.so) && !exists(/usr/lib/libgcc.a)
65# NetBSD with native Clang doesn't provide libgcc, everything is in libc. 69# NetBSD with native Clang doesn't provide libgcc, everything is in libc.
66pre-configure: fake-libgcc 70pre-configure: fake-libgcc
67 71
68fake-libgcc: 72fake-libgcc:
69 ${AR} q ${BUILDLINK_DIR}/lib/libgcc.a 73 ${AR} q ${BUILDLINK_DIR}/lib/libgcc.a
70.endif 74.endif
71 75
72.if (${OPSYS} == "NetBSD") && exists(/usr/include/term.h) 76.if (${OPSYS} == "NetBSD") && exists(/usr/include/term.h)
73CPPFLAGS+= -DTERMINFO 77CPPFLAGS+= -DTERMINFO