Page MenuHomeFreeBSD
Files F146125305

D55550.diff
No OneTemporary
Actions

D55550.diff
View Options

Index: devel/libgpr/Makefile
===================================================================
--- devel/libgpr/Makefile
+++ devel/libgpr/Makefile
@@ -16,6 +16,7 @@
USES= ada:12,run gmake
USE_BINUTILS= yes
+USE_LDCONFIG= yes
USE_GITHUB= yes
GH_ACCOUNT= AdaCore
@@ -27,18 +28,21 @@
INSTALL_TARGET= libgpr.install
GCC_VER= 12
+LIBGNATPRJ_VER= ${PORTVERSION:R:R}
PLIST_SUB= GCC_VER=${GCC_VER}
pre-configure:
${REINPLACE_CMD} \
-e "/^# Used to pass/s|^.*$$|LOCATE_XMLADA=-aP ${LOCALBASE}/share/gpr|" \
-e '/^LIB_INSTALLER/s|prefix=|prefix=${STAGEDIR}|' \
- -e '/^LIB_INSTALLER/s|$$| $${LOCATE_XMLADA}|' \
- -e '/^GPRBUILD_OPTIONS=/s|$$| $${LOCATE_XMLADA}|' \
+ -e '/^LIB_INSTALLER/s|$$| -v $${LOCATE_XMLADA} -XVERSION=${LIBGNATPRJ_VER}|' \
+ -e '/^GPRBUILD_OPTIONS=/s|$$|-vl $${LOCATE_XMLADA} -XVERSION=${LIBGNATPRJ_VER}|' \
${WRKSRC}/${MAKEFILE}
post-install:
${STRIP_CMD} \
- ${STAGEDIR}${PREFIX}/lib/gpr/relocatable/gpr/libgpr.so
+ ${STAGEDIR}${PREFIX}/lib/gpr/relocatable/gpr/libgnatprj.so
+ ${RLN} \
+ libgnatprj.so.${LIBGNATPRJ_VER} ${STAGEDIR}${PREFIX}/lib/libgnatprj.so
.include <bsd.port.mk>
Index: devel/libgpr/files/gprbuild-usrmove.patch
===================================================================
--- /dev/null
+++ devel/libgpr/files/gprbuild-usrmove.patch
@@ -0,0 +1,11 @@
+--- a/gpr/src/gpr-conf.adb
++++ b/gpr/src/gpr-conf.adb
+@@ -2564,7 +2564,7 @@
+ if Comp_Driver /= null and then Comp_Driver'Length > 0 then
+ Comp_Dir :=
+ new String'
+- (Containing_Directory (Comp_Driver.all));
++ (Containing_Directory (Normalize_Pathname (Comp_Driver.all, Resolve_Links => True)));
+
+ -- Consider only the compiler drivers that are in "bin"
+ -- subdirectories.
Index: devel/libgpr/files/patch-resolve-libgpr-conflict
===================================================================
--- /dev/null
+++ devel/libgpr/files/patch-resolve-libgpr-conflict
@@ -0,0 +1,11 @@
+--- gpr/gpr.gpr
++++ gpr/gpr.gpr
+@@ -34,7 +34,7 @@
+
+ for Source_Dirs use ("src");
+
+- for Library_Name use "gpr";
++ for Library_Name use "gnatprj";
+ for Object_Dir use "libobj/" & Bld & "/" & Gnat_Lib_Type;
+ for Library_Dir use "lib/" & Bld & "/" & Gnat_Lib_Type;
+
Index: devel/libgpr/files/patch-set-library-so-version
===================================================================
--- /dev/null
+++ devel/libgpr/files/patch-set-library-so-version
@@ -0,0 +1,10 @@
+--- gpr/gpr.gpr
++++ gpr/gpr.gpr
+@@ -31,6 +31,7 @@
+ Root_Obj_Dir := external ("OBJDIR", ".");
+
+ for Library_Kind use Gnat_Lib_Type;
++ for Library_Version use "libgnatprj.so." & external("VERSION");
+
+ for Source_Dirs use ("src");
+
Index: devel/libgpr/pkg-plist
===================================================================
--- devel/libgpr/pkg-plist
+++ devel/libgpr/pkg-plist
@@ -291,7 +291,8 @@
lib/gpr/relocatable/gpr/gpr-version.ali
lib/gpr/relocatable/gpr/gpr.ali
lib/gpr/relocatable/gpr/gpr_build_util.ali
-lib/gpr/relocatable/gpr/libgpr.so
+lib/gpr/relocatable/gpr/libgnatprj.so.25
+lib/gpr/relocatable/gpr/libgnatprj.so
lib/gpr/static-pic/gpr/gpr-ali.ali
lib/gpr/static-pic/gpr/gpr-attr-pm.ali
lib/gpr/static-pic/gpr/gpr-attr.ali
@@ -333,7 +334,7 @@
lib/gpr/static-pic/gpr/gpr-version.ali
lib/gpr/static-pic/gpr/gpr.ali
lib/gpr/static-pic/gpr/gpr_build_util.ali
-lib/gpr/static-pic/gpr/libgpr.a
+lib/gpr/static-pic/gpr/libgnatprj.a
lib/gpr/static/gpr/gpr-ali.ali
lib/gpr/static/gpr/gpr-attr-pm.ali
lib/gpr/static/gpr/gpr-attr.ali
@@ -375,7 +376,8 @@
lib/gpr/static/gpr/gpr-version.ali
lib/gpr/static/gpr/gpr.ali
lib/gpr/static/gpr/gpr_build_util.ali
-lib/gpr/static/gpr/libgpr.a
-lib/libgpr.so
+lib/gpr/static/gpr/libgnatprj.a
+lib/libgnatprj.so.25
+lib/libgnatprj.so
share/gpr/gpr.gpr
share/gpr/manifests/gpr

File Metadata

Mime Type
text/plain
Expires
Sun, Mar 1, 12:58 AM (15 h, 37 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
29071516
Default Alt Text
D55550.diff (3 KB)

Event Timeline