Wed Dec 3 13:58:57 2014 UTC ()
Make sure the fake libgcc is actually picked up when using cwrappers.


(joerg)
diff -r1.5 -r1.6 pkgsrc/editors/emacs22/Makefile.common
diff -r1.4 -r1.5 pkgsrc/editors/emacs23/Makefile.common
cvs diff -r1.5 -r1.6 pkgsrc/editors/emacs22/Attic/Makefile.common (expand / switch to unified diff)

--- pkgsrc/editors/emacs22/Attic/Makefile.common 2013/10/27 20:47:53 1.5
+++ pkgsrc/editors/emacs22/Attic/Makefile.common 2014/12/03 13:58:57 1.6
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile.common,v 1.5 2013/10/27 20:47:53 joerg Exp $ 1# $NetBSD: Makefile.common,v 1.6 2014/12/03 13:58:57 joerg Exp $
2# 2#
3# used by editors/emacs22/Makefile 3# used by editors/emacs22/Makefile
4# used by editors/emacs22-nox11/Makefile 4# used by editors/emacs22-nox11/Makefile
5 5
6COMMENT?= GNU editing macros (editor) 6COMMENT?= GNU editing macros (editor)
7 7
8DISTNAME= emacs-22.3 8DISTNAME= emacs-22.3
9PKGNAME?= ${DISTNAME:S/emacs/emacs22/} 9PKGNAME?= ${DISTNAME:S/emacs/emacs22/}
10CATEGORIES= editors 10CATEGORIES= editors
11MASTER_SITES= ${MASTER_SITE_GNU:=emacs/} 11MASTER_SITES= ${MASTER_SITE_GNU:=emacs/}
12 12
13MAINTAINER= pkgsrc-users@NetBSD.org 13MAINTAINER= pkgsrc-users@NetBSD.org
14HOMEPAGE= http://www.gnu.org/software/emacs/emacs.html 14HOMEPAGE= http://www.gnu.org/software/emacs/emacs.html
@@ -62,26 +62,27 @@ CPPFLAGS+= -DDFLY_CRT_USRLIB @@ -62,26 +62,27 @@ CPPFLAGS+= -DDFLY_CRT_USRLIB
62# "emacs" uses the C pre-processor to generate makefiles. The C pre-processor 62# "emacs" uses the C pre-processor to generate makefiles. The C pre-processor
63# of newer GCC version is designed to break this by purpose. We work around 63# of newer GCC version is designed to break this by purpose. We work around
64# that using the traditional mode to generate makefiles. 64# that using the traditional mode to generate makefiles.
65.if !empty(CC_VERSION:Mgcc-[4-9].*) 65.if !empty(CC_VERSION:Mgcc-[4-9].*)
66CPP+= -P 66CPP+= -P
67CONFIGURE_ENV+= CPP=${CPP:Q} 67CONFIGURE_ENV+= CPP=${CPP:Q}
68.endif 68.endif
69 69
70.if (${OPSYS} == "NetBSD") && \ 70.if (${OPSYS} == "NetBSD") && \
71 !exists(/usr/lib/libgcc_s.so) && !exists(/usr/lib/libgcc.a) 71 !exists(/usr/lib/libgcc_s.so) && !exists(/usr/lib/libgcc.a)
72# NetBSD with native Clang doesn't provide libgcc, everything is in libc. 72# NetBSD with native Clang doesn't provide libgcc, everything is in libc.
73pre-configure: fake-libgcc 73pre-configure: fake-libgcc
74 74
 75LDFLAGS+= -L${PREFIX}/lib
75fake-libgcc: 76fake-libgcc:
76 ${AR} q ${BUILDLINK_DIR}/lib/libgcc.a 77 ${AR} q ${BUILDLINK_DIR}/lib/libgcc.a
77.endif 78.endif
78 79
79post-extract: 80post-extract:
80 cp ${FILESDIR}/site-init.el ${WRKSRC}/lisp 81 cp ${FILESDIR}/site-init.el ${WRKSRC}/lisp
81 cp ${FILESDIR}/dragonfly.h ${WRKSRC}/src/s 82 cp ${FILESDIR}/dragonfly.h ${WRKSRC}/src/s
82 ${CHMOD} -R go-w ${WRKSRC} 83 ${CHMOD} -R go-w ${WRKSRC}
83 84
84# These dirs are installed by tar-copy and can sometimes come out mode 85# These dirs are installed by tar-copy and can sometimes come out mode
85# 754, which if PKG_DEVELOPER is set causes the build to fail. 86# 754, which if PKG_DEVELOPER is set causes the build to fail.
86post-install: 87post-install:
87.for file in leim leim/ja-dic leim/quail 88.for file in leim leim/ja-dic leim/quail
cvs diff -r1.4 -r1.5 pkgsrc/editors/emacs23/Attic/Makefile.common (expand / switch to unified diff)

--- pkgsrc/editors/emacs23/Attic/Makefile.common 2013/11/04 11:09:40 1.4
+++ pkgsrc/editors/emacs23/Attic/Makefile.common 2014/12/03 13:58:57 1.5
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile.common,v 1.4 2013/11/04 11:09:40 jperkin Exp $ 1# $NetBSD: Makefile.common,v 1.5 2014/12/03 13:58:57 joerg Exp $
2# 2#
3# used by editors/emacs23/Makefile 3# used by editors/emacs23/Makefile
4# used by editors/emacs23-nox11/Makefile 4# used by editors/emacs23-nox11/Makefile
5 5
6DISTNAME= emacs-${EMACS_VERSION} 6DISTNAME= emacs-${EMACS_VERSION}
7PKGNAME?= ${DISTNAME:S/emacs/emacs23/} 7PKGNAME?= ${DISTNAME:S/emacs/emacs23/}
8CATEGORIES= editors 8CATEGORIES= editors
9MASTER_SITES= ${MASTER_SITE_GNU:=emacs/} 9MASTER_SITES= ${MASTER_SITE_GNU:=emacs/}
10 10
11MAINTAINER= minskim@NetBSD.org 11MAINTAINER= minskim@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
@@ -59,26 +59,27 @@ CHECK_WRKREF_SKIP+= bin/emacs-${EMACS_VE @@ -59,26 +59,27 @@ CHECK_WRKREF_SKIP+= bin/emacs-${EMACS_VE
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. 61# Avoid 'malformed object' errors with older Xcode.
62. if ${OS_VERSION:R} < 11 62. if ${OS_VERSION:R} < 11
63INSTALL_UNSTRIPPED= yes 63INSTALL_UNSTRIPPED= yes
64. endif 64. endif
65.endif 65.endif
66 66
67.if (${OPSYS} == "NetBSD") && \ 67.if (${OPSYS} == "NetBSD") && \
68 !exists(/usr/lib/libgcc_s.so) && !exists(/usr/lib/libgcc.a) 68 !exists(/usr/lib/libgcc_s.so) && !exists(/usr/lib/libgcc.a)
69# 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.
70pre-configure: fake-libgcc 70pre-configure: fake-libgcc
71 71
 72LDFLAGS+= -L${PREFIX}/lib
72fake-libgcc: 73fake-libgcc:
73 ${AR} q ${BUILDLINK_DIR}/lib/libgcc.a 74 ${AR} q ${BUILDLINK_DIR}/lib/libgcc.a
74.endif 75.endif
75 76
76.if (${OPSYS} == "NetBSD") && exists(/usr/include/term.h) 77.if (${OPSYS} == "NetBSD") && exists(/usr/include/term.h)
77CPPFLAGS+= -DTERMINFO 78CPPFLAGS+= -DTERMINFO
78.elif ${OPSYS} == "DragonFly" || ${OPSYS} == "FreeBSD" || ${OPSYS} == "Linux" || ${OPSYS} == "OpenBSD" 79.elif ${OPSYS} == "DragonFly" || ${OPSYS} == "FreeBSD" || ${OPSYS} == "Linux" || ${OPSYS} == "OpenBSD"
79.include "../../mk/curses.buildlink3.mk" 80.include "../../mk/curses.buildlink3.mk"
80.else 81.else
81.include "../../mk/termcap.buildlink3.mk" 82.include "../../mk/termcap.buildlink3.mk"
82.endif 83.endif
83 84
84.include "../../mk/oss.buildlink3.mk" 85.include "../../mk/oss.buildlink3.mk"