Stuart Henderson <s...@spacehopper.org> writes:
> Could we just get rid of gfortran? It seems that nothing in ports is using
> it..
I understand your point, but except for PLIST changes for releases,
gfortran doesn't seem to add much maintenance overhead. And, as
mentioned by the OP, there are still people using it. Given the number
of files in patches/, it doesn't look like something that could be
easily installed locally. :(
I still propose that we try to resolve that conflict, diff (tested since
first submission) below for convenience. Since you mention that nothing
in ports uses it (I should have checked earlier), ok?
Index: Makefile
===================================================================
RCS file: /cvs/ports/lang/gfortran/Makefile,v
retrieving revision 1.35
diff -u -p -r1.35 Makefile
--- Makefile 12 May 2016 01:17:13 -0000 1.35
+++ Makefile 7 Jul 2016 11:10:00 -0000
@@ -15,7 +15,7 @@ PKGNAME-lib = libgfortran-$V
SHARED_LIBS = gfortran 2.0
REVISION = 16
-REVISION-lib = 18
+REVISION-lib = 19
CATEGORIES = lang math
@@ -108,5 +108,6 @@ post-install:
ln -sf /usr/lib/gcc-lib/${CONFIG}/${SYSV}/libgcc.a
${PREFIX}/lib/gcc/${CONFIG}/$V/libgcc.a
ln -sf /usr/lib/gcc-lib/${CONFIG}/${SYSV}/cc1
${PREFIX}/libexec/gcc/${CONFIG}/$V/cc1
${INSTALL_MAN} ${WRKBUILD}/gcc/doc/gfortran.1
${PREFIX}/man/man1/gfortran.1
+ rm ${PREFIX}/lib/libgfortran.la
.include <bsd.port.mk>
Index: pkg/PLIST-lib
===================================================================
RCS file: /cvs/ports/lang/gfortran/pkg/PLIST-lib,v
retrieving revision 1.3
diff -u -p -r1.3 PLIST-lib
--- pkg/PLIST-lib 19 Mar 2015 20:25:26 -0000 1.3
+++ pkg/PLIST-lib 7 Jul 2016 11:09:10 -0000
@@ -6,6 +6,5 @@ lib/gcc/${CONFIG}/${V}/
lib/gcc/${CONFIG}/${V}/libgfortranbegin.a
lib/gcc/${CONFIG}/${V}/libgfortranbegin.la
lib/libgfortran.a
-lib/libgfortran.la
@lib lib/libgfortran.so.${LIBgfortran_VERSION}
%%PIC%%
> On 2016/07/07 13:16, Jeremie Courreges-Anglas wrote:
>> Qingshan Chen <q...@discreteinfo.net> writes:
>>
>> > Sorry for the double posting here. The message was originally posted on
>> > m...@openbsd.org, and is being re-posted here, in the hope of reaching
>> > the right people.
>> >
>> >
>> > Hi All,
>> >
>> > It seems that gcc-libs-4.9.3p3 collides with libgfortran-4.3.1p16, which
>> > is required by gfortran-4.2.1p15. I have run into this issue a couple of
>> > times, when I tried to install various packages. The following message
>> > appeared when I tried to install gnucash, which requires
>> > webkit-2.4.9p4v1, which in turn requires gcc-libs-4.9.3p3:
>> >
>> > Collision in gcc-libs-4.9.3p3: the following files already exist
>> > /usr/local/lib/libgfortran.la (libgfortran-4.2.1p16 and
>> > gcc-libs-4.9.3p3)
>> > Can't install webkit-2.4.9p4v1: can't resolve gcc-libs-4.9.3p3
>> >
>> > I installed OpenBSD recently, on this Toshiba Satellite L505 laptop, and
>> > I have applied all the published security patches. Beyond that, I have
>> > no idea how to resolve this collision issue. I do need to keep this
>> > gfortran package on my system for my scientific research. Any
>> > suggestions will be greatly appreciated. Thanks!
>> >
>> > Best,
>> > Qingshan
>>
>> gcc-libs is almost a requirement these days. I hope that we can just
>> remove the .la from the gfortran package. This should go in a bulk
>> build to ensure that nothing breaks.
>>
>> (Diff not tested)
>>
>> Index: Makefile
>> ===================================================================
>> RCS file: /cvs/ports/lang/gfortran/Makefile,v
>> retrieving revision 1.35
>> diff -u -p -r1.35 Makefile
>> --- Makefile 12 May 2016 01:17:13 -0000 1.35
>> +++ Makefile 7 Jul 2016 11:10:00 -0000
>> @@ -15,7 +15,7 @@ PKGNAME-lib = libgfortran-$V
>> SHARED_LIBS = gfortran 2.0
>>
>> REVISION = 16
>> -REVISION-lib = 18
>> +REVISION-lib = 19
>>
>> CATEGORIES = lang math
>>
>> @@ -108,5 +108,6 @@ post-install:
>> ln -sf /usr/lib/gcc-lib/${CONFIG}/${SYSV}/libgcc.a
>> ${PREFIX}/lib/gcc/${CONFIG}/$V/libgcc.a
>> ln -sf /usr/lib/gcc-lib/${CONFIG}/${SYSV}/cc1
>> ${PREFIX}/libexec/gcc/${CONFIG}/$V/cc1
>> ${INSTALL_MAN} ${WRKBUILD}/gcc/doc/gfortran.1
>> ${PREFIX}/man/man1/gfortran.1
>> + rm ${PREFIX}/lib/libgfortran.la
>>
>> .include <bsd.port.mk>
>> Index: pkg/PLIST-lib
>> ===================================================================
>> RCS file: /cvs/ports/lang/gfortran/pkg/PLIST-lib,v
>> retrieving revision 1.3
>> diff -u -p -r1.3 PLIST-lib
>> --- pkg/PLIST-lib 19 Mar 2015 20:25:26 -0000 1.3
>> +++ pkg/PLIST-lib 7 Jul 2016 11:09:10 -0000
>> @@ -6,6 +6,5 @@ lib/gcc/${CONFIG}/${V}/
>> lib/gcc/${CONFIG}/${V}/libgfortranbegin.a
>> lib/gcc/${CONFIG}/${V}/libgfortranbegin.la
>> lib/libgfortran.a
>> -lib/libgfortran.la
>> @lib lib/libgfortran.so.${LIBgfortran_VERSION}
>> %%PIC%%
>>
>>
>>
>> --
>> jca | PGP: 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE
>>
>
--
jca | PGP: 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE
