Attachment #250705 for bug #279041

View | Details | Raw Unified | Return to bug 279041
Collapse All | Expand All




PORTNAME=	opam
DISTVERSION=	2.1.6
PORTREVISION=	3
CATEGORIES=	devel
MASTER_SITES=	https://github.com/ocaml/opam/releases/download/${DISTVERSION}/
PKGNAMEPREFIX=	ocaml-


RUN_DEPENDS=	curl:ftp/curl \
		gpatch:devel/patch \
		gmake:devel/gmake
		${RUN_DEPENDS_${ARCH}}
RUN_DEPENDS_armv6=	${LOCALBASE}/bin/as:devel/binutils
RUN_DEPENDS_armv7=	${LOCALBASE}/bin/as:devel/binutils

USES=		gmake
ARCH!=		uname -p
.if ${ARCH} == armv6 || ${ARCH} == armv7
RUN_DEPENDS+=	${LOCALBASE}/bin/as:devel/binutils
USE_BINUTILS=	yes
.endif


LDFLAGS_armv6=	-Wl,-z,notext
LDFLAGS_armv7=	-Wl,-z,notext
LDFLAGS_powerpc=	-Wl,-z,notext
LDFLAGS_i386=	-Wl,-z,notext
LDFLAGS+=	${LDFLAGS_${ARCH}}

NOPRECIOUSMAKEVARS=	yes

Lines 1-3 Link Here

(-)b/devel/ocaml-opam/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1685599850	1	TIMESTAMP = 1715883550
2	SHA256 (opam-full-2.1.5.tar.gz) = 09f8d9e410b2f5723c2bfedbf7970e3b305f5017895fcd91759f05e753ddcea5	2	SHA256 (opam-full-2.1.6.tar.gz) = d2af5edc85f552e0cf5ec0ddcc949d94f2dc550dc5df595174a06a4eaf8af628
3	SIZE (opam-full-2.1.5.tar.gz) = 10801367	3	SIZE (opam-full-2.1.6.tar.gz) = 11704198




--- src_ext/ocaml-patches/0001-Fix-relocation-ocaml-32-bit.patch.orig	2023-05-27 13:17:37 UTC
+++ src_ext/ocaml-patches/0001-Fix-relocation-ocaml-32-bit.patch
@@ -0,0 +1,32 @@
+--- a/configure.orig	2023-05-27 13:13:22 UTC
++++ a/configure
+@@ -14256,12 +14256,20 @@ case $host in #(
+        case $CC,$host in #(
+   gcc*,powerpc-*-linux*) :
+     mksharedlib="$CC -shared -mbss-plt \$(LDFLAGS)" ;; #(
++  *,i[3456]86-*) :
++    # Disable DT_TEXTREL warnings on Linux and BSD i386
++    # See https://github.com/ocaml/ocaml/issues/9800
++    mksharedlib="$CC -shared \$(LDFLAGS) -Wl,-z,notext" ;; #(
+   *) :
+     mksharedlib="$CC -shared \$(LDFLAGS)" ;;
+ esac
+@@ -14256,12 +14260,20 @@ case $host in #(
+     arch=amd64; system=win64 ;; #(
+   powerpc64le*-*-linux*) :
+     arch=power; model=ppc64le; system=elf ;; #(

+   s390x*-*-linux*) :
+     arch=s390x; model=z10; system=elf ;; #(
+   # expected to match "gnueabihf" as well as "musleabihf"
+@@ -14281,6 +14289,8 @@
+     arch=arm; model=armv6; system=linux_eabi ;; #(
+   armv6*-*-freebsd*) :
+     arch=arm; model=armv6; system=freebsd ;; #(

Return to bug 279041

Lines 1-6 Link Here

(-)b/devel/ocaml-opam/Makefile (-6 / +4 lines)
1	PORTNAME= opam	1	PORTNAME= opam
2	DISTVERSION= 2.1.5	2	DISTVERSION= 2.1.6
3	PORTREVISION= 3
4	CATEGORIES= devel	3	CATEGORIES= devel
5	MASTER_SITES= https://github.com/ocaml/opam/releases/download/${DISTVERSION}/	4	MASTER_SITES= https://github.com/ocaml/opam/releases/download/${DISTVERSION}/
6	PKGNAMEPREFIX= ocaml-	5	PKGNAMEPREFIX= ocaml-
Lines 14-27 LICENSE= LGPL21 Link Here
14		13
15	RUN_DEPENDS= curl:ftp/curl \	14	RUN_DEPENDS= curl:ftp/curl \
16	gpatch:devel/patch \	15	gpatch:devel/patch \
17	gmake:devel/gmake \	16	gmake:devel/gmake
18	${RUN_DEPENDS_${ARCH}}
19	RUN_DEPENDS_armv6= ${LOCALBASE}/bin/as:devel/binutils
20	RUN_DEPENDS_armv7= ${LOCALBASE}/bin/as:devel/binutils
21		17
22	USES= gmake	18	USES= gmake
23	ARCH!= uname -p	19	ARCH!= uname -p
24	.if ${ARCH} == armv6 \|\| ${ARCH} == armv7	20	.if ${ARCH} == armv6 \|\| ${ARCH} == armv7
		21	RUN_DEPENDS+= ${LOCALBASE}/bin/as:devel/binutils
25	USE_BINUTILS= yes	22	USE_BINUTILS= yes
26	.endif	23	.endif
27		24
Lines 35-40 ALL_TARGET= cold-lib-ext cold-all Link Here
35	LDFLAGS_armv6= -Wl,-z,notext	32	LDFLAGS_armv6= -Wl,-z,notext
36	LDFLAGS_armv7= -Wl,-z,notext	33	LDFLAGS_armv7= -Wl,-z,notext
37	LDFLAGS_powerpc= -Wl,-z,notext	34	LDFLAGS_powerpc= -Wl,-z,notext
		35	LDFLAGS_i386= -Wl,-z,notext
38	LDFLAGS+= ${LDFLAGS_${ARCH}}	36	LDFLAGS+= ${LDFLAGS_${ARCH}}
39		37
40	NOPRECIOUSMAKEVARS= yes	38	NOPRECIOUSMAKEVARS= yes

Lines 1-20 Link Here

(-)b/devel/ocaml-opam/files/patch-src__ext_ocaml-patches_0001-Fix-relocation-ocaml-32-bit.patch (-14 / +3 lines)
1	--- src_ext/ocaml-patches/0001-Fix-relocation-ocaml-32-bit.patch.orig 2023-05-27 13:17:37 UTC	1	--- src_ext/ocaml-patches/0001-Fix-relocation-ocaml-32-bit.patch.orig 2023-05-27 13:17:37 UTC
2	+++ src_ext/ocaml-patches/0001-Fix-relocation-ocaml-32-bit.patch	2	+++ src_ext/ocaml-patches/0001-Fix-relocation-ocaml-32-bit.patch
3	@@ -0,0 +1,43 @@	3	@@ -0,0 +1,32 @@
4	+--- a/configure.orig 2023-05-27 13:13:22 UTC	4	+--- a/configure.orig 2023-05-27 13:13:22 UTC
5	++++ a/configure	5	++++ a/configure
6	+@@ -14070,6 +14070,10 @@	6	+@@ -14256,12 +14256,20 @@ case $host in #(
7	+ case $CC,$host in #(
8	+ gcc,powerpc--linux*) :
9	+ mksharedlib="$CC -shared -mbss-plt \$(LDFLAGS)" ;; #(
10	++ ,i[3456]86-) :
11	++ # Disable DT_TEXTREL warnings on Linux and BSD i386
12	++ # See https://github.com/ocaml/ocaml/issues/9800
13	++ mksharedlib="$CC -shared \$(LDFLAGS) -Wl,-z,notext" ;; #(
14	+ *) :
15	+ mksharedlib="$CC -shared \$(LDFLAGS)" ;;
16	+ esac
17	+@@ -14256,12 +14260,20 @@ case $host in #(
18	+ arch=amd64; system=win64 ;; #(	7	+ arch=amd64; system=win64 ;; #(
19	+ powerpc64le--linux*) :	8	+ powerpc64le--linux*) :
20	+ arch=power; model=ppc64le; system=elf ;; #(	9	+ arch=power; model=ppc64le; system=elf ;; #(
Lines 35-41 Link Here
35	+ s390x--linux*) :	24	+ s390x--linux*) :
36	+ arch=s390x; model=z10; system=elf ;; #(	25	+ arch=s390x; model=z10; system=elf ;; #(
37	+ # expected to match "gnueabihf" as well as "musleabihf"	26	+ # expected to match "gnueabihf" as well as "musleabihf"
38	+@@ -14281,6 +14285,8 @@	27	+@@ -14281,6 +14289,8 @@
39	+ arch=arm; model=armv6; system=linux_eabi ;; #(	28	+ arch=arm; model=armv6; system=linux_eabi ;; #(
40	+ armv6--freebsd*) :	29	+ armv6--freebsd*) :
41	+ arch=arm; model=armv6; system=freebsd ;; #(	30	+ arch=arm; model=armv6; system=freebsd ;; #(