cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Move gcc's .la files into the gcc-libs package, they are required for linking.

Browse Source 
Build problem noticed with epiphany which doesn't itself need gcc4 but uses
libraries which do.  ok ajacoutot@ pascal@
This commit is contained in:
sthen 2015-09-24 08:51:48 +00:00
parent 488651d1f9
commit 6ec5a88ed7
12 changed files with 24 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lang/gcc/4.9/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.21 2015/09/16 10:59:25 pascal Exp $
# $OpenBSD: Makefile,v 1.22 2015/09/24 08:51:48 sthen Exp $
BROKEN-arm = needs binutils-2.17
@ -6,7 +6,7 @@ ONLY_FOR_ARCHS = amd64 arm hppa i386 mips64 mips64el powerpc sparc sparc64
DPB_PROPERTIES = parallel
V = 4.9.3
REVISION = 1
REVISION = 2
FULL_VERSION = $V
FULL_PKGVERSION = $V

3
lang/gcc/4.9/pkg/PFRAG.CILKRTS-libs
View File

@ -1,2 +1,3 @@
@comment $OpenBSD: PFRAG.CILKRTS-libs,v 1.1.1.1 2014/06/26 16:30:22 pascal Exp $
@comment $OpenBSD: PFRAG.CILKRTS-libs,v 1.2 2015/09/24 08:51:49 sthen Exp $
lib/libcilkrts.la
@lib lib/libcilkrts.so.${LIBcilkrts_VERSION}

3
lang/gcc/4.9/pkg/PFRAG.CILKRTS-main
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PFRAG.CILKRTS-main,v 1.1.1.1 2014/06/26 16:30:22 pascal Exp $
@comment $OpenBSD: PFRAG.CILKRTS-main,v 1.2 2015/09/24 08:51:49 sthen Exp $
lib/gcc/${CONFIG}/${V}/include/cilk/
lib/gcc/${CONFIG}/${V}/include/cilk/cilk.h
lib/gcc/${CONFIG}/${V}/include/cilk/cilk_api.h
@ -23,5 +23,4 @@ lib/gcc/${CONFIG}/${V}/include/cilk/reducer_opxor.h
lib/gcc/${CONFIG}/${V}/include/cilk/reducer_ostream.h
lib/gcc/${CONFIG}/${V}/include/cilk/reducer_string.h
lib/libcilkrts.a
lib/libcilkrts.la
lib/libcilkrts.spec

3
lang/gcc/4.9/pkg/PFRAG.ITM-libs
View File

@ -1,2 +1,3 @@
@comment $OpenBSD: PFRAG.ITM-libs,v 1.1.1.1 2014/06/26 16:30:22 pascal Exp $
@comment $OpenBSD: PFRAG.ITM-libs,v 1.2 2015/09/24 08:51:49 sthen Exp $
lib/libitm.la
@lib lib/libitm.so.${LIBitm_VERSION}

3
lang/gcc/4.9/pkg/PFRAG.ITM-main
View File

@ -1,5 +1,4 @@
@comment $OpenBSD: PFRAG.ITM-main,v 1.1.1.1 2014/06/26 16:30:18 pascal Exp $
@comment $OpenBSD: PFRAG.ITM-main,v 1.2 2015/09/24 08:51:49 sthen Exp $
@info info/libitm.info
lib/libitm.a
lib/libitm.la
lib/libitm.spec

3
lang/gcc/4.9/pkg/PFRAG.QUADMATH-libs
View File

@ -1,2 +1,3 @@
@comment $OpenBSD: PFRAG.QUADMATH-libs,v 1.1.1.1 2014/06/26 16:30:22 pascal Exp $
@comment $OpenBSD: PFRAG.QUADMATH-libs,v 1.2 2015/09/24 08:51:49 sthen Exp $
lib/libquadmath.la
@lib lib/libquadmath.so.${LIBquadmath_VERSION}

3
lang/gcc/4.9/pkg/PFRAG.QUADMATH-main
View File

@ -1,4 +1,3 @@
@comment $OpenBSD: PFRAG.QUADMATH-main,v 1.1.1.1 2014/06/26 16:30:18 pascal Exp $
@comment $OpenBSD: PFRAG.QUADMATH-main,v 1.2 2015/09/24 08:51:49 sthen Exp $
@info info/libquadmath.info
lib/libquadmath.a
lib/libquadmath.la

3
lang/gcc/4.9/pkg/PLIST-c++
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST-c++,v 1.1.1.1 2014/06/26 16:30:20 pascal Exp $
@comment $OpenBSD: PLIST-c++,v 1.2 2015/09/24 08:51:49 sthen Exp $
@conflict gcc-libs->=4.10
@bin bin/ec++
@bin bin/eg++
@ -729,7 +729,6 @@ include/c++/${V}/${CONFIG}/bits/time_members.h
include/c++/${V}/${CONFIG}/ext/
include/c++/${V}/${CONFIG}/ext/opt_random.h
lib/libestdc++.a
lib/libestdc++.la
lib/libesupc++.a
lib/libesupc++.la
lib/libstdc++*-gdb.py

3
lang/gcc/4.9/pkg/PLIST-f95
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST-f95,v 1.1.1.1 2014/06/26 16:30:20 pascal Exp $
@comment $OpenBSD: PLIST-f95,v 1.2 2015/09/24 08:51:49 sthen Exp $
@conflict gfortran-*
@conflict libgfortran-*
@bin bin/egfortran
@ -10,7 +10,6 @@ lib/gcc/${CONFIG}/${V}/libcaf_single.la
lib/gcc/${CONFIG}/${V}/libgfortranbegin.a
lib/gcc/${CONFIG}/${V}/libgfortranbegin.la
lib/libgfortran.a
lib/libgfortran.la
lib/libgfortran.spec
@bin libexec/gcc/${CONFIG}/${V}/f951
@man man/man1/egfortran.1

10
lang/gcc/4.9/pkg/PLIST-libs
View File

@ -1,9 +1,17 @@
@comment $OpenBSD: PLIST-libs,v 1.2 2015/02/03 20:32:12 pascal Exp $
@comment $OpenBSD: PLIST-libs,v 1.3 2015/09/24 08:51:49 sthen Exp $
@option no-default-conflict
@conflict gcc-libs->=4.9,<4.10
@conflict gcc->=4.9,<4.9.3p2
@conflict g++->=4.9,<4.9.3p2
@conflict g95->=4.9,<4.9.3p2
@conflict gobjc->=4.9,<4.9.3p2
lib/libatomic.la
@lib lib/libatomic.so.${LIBatomic_VERSION}
lib/libestdc++.la
@lib lib/libestdc++.so.${LIBestdc++_VERSION}
lib/libgfortran.la
@lib lib/libgfortran.so.${LIBgfortran_VERSION}
lib/libobjc.la
@lib lib/libobjc.so.${LIBobjc_VERSION}
%%CILKRTS%%
%%ITM%%

3
lang/gcc/4.9/pkg/PLIST-main
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST-main,v 1.7 2015/09/11 08:07:44 pascal Exp $
@comment $OpenBSD: PLIST-main,v 1.8 2015/09/24 08:51:49 sthen Exp $
@bin bin/ecpp
@bin bin/egcc
@bin bin/egcc-ar
@ -238,7 +238,6 @@ lib/gcc/${CONFIG}/${V}/plugin/include/varasm.h
lib/gcc/${CONFIG}/${V}/plugin/include/vec.h
lib/gcc/${CONFIG}/${V}/plugin/include/version.h
lib/libatomic.a
lib/libatomic.la
lib/libssp.a
lib/libssp.la
@lib lib/libssp.so.${LIBssp_VERSION}

3
lang/gcc/4.9/pkg/PLIST-objc
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST-objc,v 1.1.1.1 2014/06/26 16:30:22 pascal Exp $
@comment $OpenBSD: PLIST-objc,v 1.2 2015/09/24 08:51:49 sthen Exp $
lib/gcc/${CONFIG}/${V}/include/objc/
lib/gcc/${CONFIG}/${V}/include/objc/NXConstStr.h
lib/gcc/${CONFIG}/${V}/include/objc/Object.h
@ -11,5 +11,4 @@ lib/gcc/${CONFIG}/${V}/include/objc/objc.h
lib/gcc/${CONFIG}/${V}/include/objc/runtime.h
lib/gcc/${CONFIG}/${V}/include/objc/thr.h
lib/libobjc.a
lib/libobjc.la
@bin libexec/gcc/${CONFIG}/${V}/cc1obj