| 1 |
mrness 09/08/22 22:40:17 |
| 2 |
|
| 3 |
Modified: gentoo.config.m4 |
| 4 |
Added: libmilter-sharedlib.patch |
| 5 |
Log: |
| 6 |
Use the real libmilter version iso sendmail version. |
| 7 |
Install libmilter library in both forms, static and dynamic (#245950). |
| 8 |
(Portage version: 2.1.6.13/cvs/Linux x86_64, RepoMan options: --force) |
| 9 |
|
| 10 |
Revision Changes Path |
| 11 |
1.3 mail-filter/libmilter/files/gentoo.config.m4 |
| 12 |
|
| 13 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/mail-filter/libmilter/files/gentoo.config.m4?rev=1.3&view=markup |
| 14 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/mail-filter/libmilter/files/gentoo.config.m4?rev=1.3&content-type=text/plain |
| 15 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/mail-filter/libmilter/files/gentoo.config.m4?r1=1.2&r2=1.3 |
| 16 |
|
| 17 |
Index: gentoo.config.m4 |
| 18 |
=================================================================== |
| 19 |
RCS file: /var/cvsroot/gentoo-x86/mail-filter/libmilter/files/gentoo.config.m4,v |
| 20 |
retrieving revision 1.2 |
| 21 |
retrieving revision 1.3 |
| 22 |
diff -u -r1.2 -r1.3 |
| 23 |
--- gentoo.config.m4 11 Oct 2007 14:30:26 -0000 1.2 |
| 24 |
+++ gentoo.config.m4 22 Aug 2009 22:40:17 -0000 1.3 |
| 25 |
@@ -1,2 +1,5 @@ |
| 26 |
define(`confOPTIMIZE', `@@CFLAGS@@') |
| 27 |
+define(`confLDOPTS', `@@LDFLAGS@@') |
| 28 |
+define(`confCC', `@@CC@@') |
| 29 |
define(`confENVDEF', `@@ENVDEF@@') |
| 30 |
+define(`confCCOPTS_SO', `-fPIC') |
| 31 |
|
| 32 |
|
| 33 |
|
| 34 |
1.1 mail-filter/libmilter/files/libmilter-sharedlib.patch |
| 35 |
|
| 36 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/mail-filter/libmilter/files/libmilter-sharedlib.patch?rev=1.1&view=markup |
| 37 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/mail-filter/libmilter/files/libmilter-sharedlib.patch?rev=1.1&content-type=text/plain |
| 38 |
|
| 39 |
Index: libmilter-sharedlib.patch |
| 40 |
=================================================================== |
| 41 |
diff -Nru sendmail-8.14.3.orig/devtools/M4/UNIX/milterlibrary.m4 sendmail-8.14.3/devtools/M4/UNIX/milterlibrary.m4 |
| 42 |
--- sendmail-8.14.3.orig/devtools/M4/UNIX/milterlibrary.m4 1970-01-01 01:00:00.000000000 +0100 |
| 43 |
+++ sendmail-8.14.3/devtools/M4/UNIX/milterlibrary.m4 2009-08-22 21:51:10.000000000 +0200 |
| 44 |
@@ -0,0 +1,39 @@ |
| 45 |
+divert(-1) |
| 46 |
+# |
| 47 |
+# Copyright (c) 1999-2001 Sendmail, Inc. and its suppliers. |
| 48 |
+# All rights reserved. |
| 49 |
+# |
| 50 |
+# By using this file, you agree to the terms and conditions set |
| 51 |
+# forth in the LICENSE file which can be found at the top level of |
| 52 |
+# the sendmail distribution. |
| 53 |
+# |
| 54 |
+# |
| 55 |
+# Definitions for Makefile construction for sendmail |
| 56 |
+# |
| 57 |
+divert(0)dnl |
| 58 |
+include(confBUILDTOOLSDIR`/M4/'bldM4_TYPE_DIR`/links.m4')dnl |
| 59 |
+bldLIST_PUSH_ITEM(`bldC_PRODUCTS', bldCURRENT_PRODUCT)dnl |
| 60 |
+bldPUSH_TARGET(bldCURRENT_PRODUCT`.so' bldCURRENT_PRODUCT`.a')dnl |
| 61 |
+bldPUSH_INSTALL_TARGET(`install-'bldCURRENT_PRODUCT)dnl |
| 62 |
+bldPUSH_CLEAN_TARGET(bldCURRENT_PRODUCT`-clean')dnl |
| 63 |
+ |
| 64 |
+include(confBUILDTOOLSDIR`/M4/'bldM4_TYPE_DIR`/defines.m4') |
| 65 |
+divert(bldTARGETS_SECTION) |
| 66 |
+bldCURRENT_PRODUCT.so: ${BEFORE} ${bldCURRENT_PRODUCT`OBJS'} |
| 67 |
+ ${CCLINK} ${LDOPTS_SO} -o bldCURRENT_PRODUCT.so -Wl,confSONAME,bldCURRENT_PRODUCT.so.${MILTER_SOVER} ${bldCURRENT_PRODUCT`OBJS'} -lc |
| 68 |
+bldCURRENT_PRODUCT.a: ${BEFORE} ${bldCURRENT_PRODUCT`OBJS'} |
| 69 |
+ ${AR} ${AROPTS} bldCURRENT_PRODUCT.a ${bldCURRENT_PRODUCT`OBJS'} |
| 70 |
+ ${RANLIB} ${RANLIBOPTS} bldCURRENT_PRODUCT.a |
| 71 |
+ifdef(`bldLINK_SOURCES', `bldMAKE_SOURCE_LINKS(bldLINK_SOURCES)') |
| 72 |
+ |
| 73 |
+install-`'bldCURRENT_PRODUCT: bldCURRENT_PRODUCT.so bldCURRENT_PRODUCT.a |
| 74 |
+ifdef(`bldINSTALLABLE', ` ifdef(`confMKDIR', `if [ ! -d ${DESTDIR}${bldINSTALL_DIR`'LIBDIR} ]; then confMKDIR -p ${DESTDIR}${bldINSTALL_DIR`'LIBDIR}; else :; fi ') |
| 75 |
+ ${INSTALL} -c -o ${LIBOWN} -g ${LIBGRP} -m ${UBINMODE} bldCURRENT_PRODUCT.so ${DESTDIR}${LIBDIR}/bldCURRENT_PRODUCT.so.${MILTER_SOVER} |
| 76 |
+ ${LN} ${LNOPTS} bldCURRENT_PRODUCT.so.${MILTER_SOVER} ${DESTDIR}${LIBDIR}/bldCURRENT_PRODUCT.so |
| 77 |
+ ${INSTALL} -c -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} bldCURRENT_PRODUCT.a ${DESTDIR}${LIBDIR}') |
| 78 |
+ |
| 79 |
+bldCURRENT_PRODUCT-clean: |
| 80 |
+ rm -f ${OBJS} bldCURRENT_PRODUCT.so bldCURRENT_PRODUCT.a ${MANPAGES} |
| 81 |
+ |
| 82 |
+divert(0) |
| 83 |
+COPTS+= confCCOPTS_SO |
| 84 |
diff -Nru sendmail-8.14.3.orig/libmilter/Makefile.m4 sendmail-8.14.3/libmilter/Makefile.m4 |
| 85 |
--- sendmail-8.14.3.orig/libmilter/Makefile.m4 2008-04-08 07:23:44.000000000 +0200 |
| 86 |
+++ sendmail-8.14.3/libmilter/Makefile.m4 2009-08-22 21:53:35.000000000 +0200 |
| 87 |
@@ -9,7 +9,7 @@ |
| 88 |
SMSRCDIR=ifdef(`confSMSRCDIR', `confSMSRCDIR', `${SRCDIR}/sendmail') |
| 89 |
PREPENDDEF(`confINCDIRS', `-I${SMSRCDIR} ') |
| 90 |
|
| 91 |
-bldPRODUCT_START(`library', `libmilter') |
| 92 |
+bldPRODUCT_START(`milterlibrary', `libmilter') |
| 93 |
define(`bldINSTALLABLE', `true') |
| 94 |
define(`LIBMILTER_EXTRAS', `errstring.c strl.c') |
| 95 |
APPENDDEF(`confENVDEF', `-DNOT_SENDMAIL -Dsm_snprintf=snprintf') |
Archives