head	1.2;
access;
symbols;
locks; strict;
comment	@# @;


1.2
date	2013.02.20.22.45.24;	author svnexp;	state Exp;
branches;
next	1.1;

1.1
date	2013.01.11.17.56.52;	author svnexp;	state Exp;
branches;
next	;


desc
@@


1.2
log
@## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/312679
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
@
text
@--- mailnews/extensions/enigmail/ipc/src/Makefile.enig~
+++ mailnews/extensions/enigmail/ipc/src/Makefile.enig
@@@@ -19,26 +19,26 @@@@ endif
 
 ifeq ($(OS_ARCH),NetBSD)
 ifeq ($(DLL_SUFFIX),.so.1.0)
-LDFLAGS += -Wl,-Bsymbolic
+LDFLAGS += -shared -Wl,-Bsymbolic
 CFLAGS += -fPIC
 endif
 endif
 
 ifeq ($(OS_ARCH),FreeBSD)
-LDFLAGS += -Wl,-Bsymbolic
+LDFLAGS += -shared -Wl,-Bsymbolic
 CFLAGS += -fPIC
 endif
 
 ifeq ($(OS_ARCH),HP-UX)
 ifeq ($(GNU_CC)$(GNU_CXX),)
-LDFLAGS += -Wl,-Bsymbolic
+LDFLAGS += -shared -Wl,-Bsymbolic
 CFLAGS += -fPIC
 endif
 endif
 
 ifeq ($(OS_ARCH),OSF1)
 ifeq ($(GNU_CC)$(GNU_CXX),)
-LDFLAGS += -B symbolic
+LDFLAGS += -shared -B symbolic
 CFLAGS += -fPIC
 endif
 endif
--- mailnews/extensions/enigmail/ipc/src/Makefile.in~
+++ mailnews/extensions/enigmail/ipc/src/Makefile.in
@@@@ -19,26 +19,26 @@@@ endif
 
 ifeq ($(OS_ARCH),NetBSD)
 ifeq ($(DLL_SUFFIX),.so.1.0)
-LDFLAGS += -Wl,-Bsymbolic
+LDFLAGS += -shared -Wl,-Bsymbolic
 CFLAGS += -fPIC
 endif
 endif
 
 ifeq ($(OS_ARCH),FreeBSD)
-LDFLAGS += -Wl,-Bsymbolic
+LDFLAGS += -shared -Wl,-Bsymbolic
 CFLAGS += -fPIC
 endif
 
 ifeq ($(OS_ARCH),HP-UX)
 ifeq ($(GNU_CC)$(GNU_CXX),)
-LDFLAGS += -Wl,-Bsymbolic
+LDFLAGS += -shared -Wl,-Bsymbolic
 CFLAGS += -fPIC
 endif
 endif
 
 ifeq ($(OS_ARCH),OSF1)
 ifeq ($(GNU_CC)$(GNU_CXX),)
-LDFLAGS += -B symbolic
+LDFLAGS += -shared -B symbolic
 CFLAGS += -fPIC
 endif
 endif
@


1.1
log
@## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/310240
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
## SVN ##
## SVN ## ------------------------------------------------------------------------
## SVN ## r310240 | flo | 2013-01-11 16:48:10 +0000 (Fri, 11 Jan 2013) | 3 lines
## SVN ##
## SVN ## Only try patching enigmail when the option is selected. This fixed the build
## SVN ## with the enigmail option disabled.
## SVN ##
## SVN ## ------------------------------------------------------------------------
## SVN ##
@
text
@a33 12
@@@@ -62,7 +62,11 @@@@ libs: source
 	$(CC) $(LDFLAGS) -o $(libname) $(objfiles)
 
 source: $(source)
+ifneq (,$(filter 4.2.%, $(CC_VERSION)))
+	$(CC) $(CFLAGS) -c -o $(objfiles) $^
+else
 	$(CC) $(CFLAGS) -Wno-return-type-c-linkage -c -o $(objfiles) $^
+endif
 
 
 clean:
a66 12
@@@@ -62,7 +62,11 @@@@ libs: source
 	$(CC) $(LDFLAGS) -o $(libname) $(objfiles)
 
 source: $(source)
+ifneq (,$(filter 4.2.%, $(CC_VERSION)))
+	$(CC) $(CFLAGS) -c -o $(objfiles) $^
+else
 	$(CC) $(CFLAGS) -Wno-return-type-c-linkage -c -o $(objfiles) $^
+endif
 
 
 clean:
@

