diff options
author | marino <marino@FreeBSD.org> | 2014-02-19 10:19:43 +0800 |
---|---|---|
committer | marino <marino@FreeBSD.org> | 2014-02-19 10:19:43 +0800 |
commit | 0e253ee41ec9ead6279415e1753f0560416108f7 (patch) | |
tree | 510cb974761371dbabdccbabe47b4db08888423f /devel | |
parent | 48f74c0608b855468eff5745a85c80e4e6ed7a2d (diff) | |
download | freebsd-ports-gnome-0e253ee41ec9ead6279415e1753f0560416108f7.tar.gz freebsd-ports-gnome-0e253ee41ec9ead6279415e1753f0560416108f7.tar.zst freebsd-ports-gnome-0e253ee41ec9ead6279415e1753f0560416108f7.zip |
devel/spark2012: Build the static library to stop ironsides leftovers
Without a static library present, gnatmake will build the objects it
needs in the base system -- that's not legal.
The original issue I had with this was using BSD_INSTALL_LIB which
stripped out the symbols in the static library, but I didn't realize
what was happening. Now I know and the library is installed intact
with BSD_INSTALL_DATA.
Diffstat (limited to 'devel')
-rw-r--r-- | devel/libspark2012/Makefile | 5 | ||||
-rw-r--r-- | devel/libspark2012/files/patch-Makefile | 29 | ||||
-rw-r--r-- | devel/libspark2012/files/patch-spark2012.gpr | 13 | ||||
-rw-r--r-- | devel/libspark2012/pkg-plist | 21 |
4 files changed, 65 insertions, 3 deletions
diff --git a/devel/libspark2012/Makefile b/devel/libspark2012/Makefile index 0887e367f2bb..3d78f49655a0 100644 --- a/devel/libspark2012/Makefile +++ b/devel/libspark2012/Makefile @@ -3,6 +3,7 @@ PORTNAME= libspark2012 PORTVERSION= 2012 +PORTREVISION= 1 CATEGORIES= devel MASTER_SITES= http://downloads.dragonlace.net/src/ @@ -11,9 +12,7 @@ COMMENT= SPARK 2012 Spark.Ada library LICENSE= GPLv3 +USES= ada USE_BZIP2= yes -# No library is built; only the source files are installed -# Therefore, USES=ada is not required - .include <bsd.port.mk> diff --git a/devel/libspark2012/files/patch-Makefile b/devel/libspark2012/files/patch-Makefile new file mode 100644 index 000000000000..062ee1a6125a --- /dev/null +++ b/devel/libspark2012/files/patch-Makefile @@ -0,0 +1,29 @@ +--- Makefile.orig 2014-02-17 05:26:40.000000000 -0500 ++++ Makefile +@@ -1,23 +1,13 @@ +-all: nada ++all: build + +-nada: +- +-build-orig: ++build: + gnatmake -p -P build_spark2012 + + install: + mkdir -p ${DESTDIR}${PREFIX}/lib/gnat \ +- ${DESTDIR}${PREFIX}/include/spark2012 +- ${BSD_INSTALL_DATA} spark2012.gpr \ +- ${DESTDIR}${PREFIX}/lib/gnat +- ${BSD_INSTALL_DATA} src/*.ad[bs] \ +- ${DESTDIR}${PREFIX}/include/spark2012 +- +-install-orig: +- mkdir -p ${DESTDIR}${PREFIX}/lib/gnat \ + ${DESTDIR}${PREFIX}/lib/spark2012 \ + ${DESTDIR}${PREFIX}/include/spark2012 +- ${BSD_INSTALL_LIB} src/build/lib/libspark2012.a \ ++ ${BSD_INSTALL_DATA} src/build/lib/libspark2012.a \ + ${DESTDIR}${PREFIX}/lib/spark2012 + ${BSD_INSTALL_DATA} src/build/lib/*.ali \ + ${DESTDIR}${PREFIX}/lib/spark2012 diff --git a/devel/libspark2012/files/patch-spark2012.gpr b/devel/libspark2012/files/patch-spark2012.gpr new file mode 100644 index 000000000000..747f63af5b11 --- /dev/null +++ b/devel/libspark2012/files/patch-spark2012.gpr @@ -0,0 +1,13 @@ +--- spark2012.gpr.orig 2014-02-17 05:33:24.000000000 -0500 ++++ spark2012.gpr +@@ -1,5 +1,10 @@ + project SPARK2012 is + ++ for Languages use ("Ada"); + for Source_Dirs use ("../../include/spark2012"); ++ for Library_Dir use "../../lib/spark2012"; ++ for Library_Name use "spark2012"; ++ for Library_Kind use "static"; ++ for Externally_Built use "True"; + + end SPARK2012; diff --git a/devel/libspark2012/pkg-plist b/devel/libspark2012/pkg-plist index 01aad8ced41b..bc54327f82eb 100644 --- a/devel/libspark2012/pkg-plist +++ b/devel/libspark2012/pkg-plist @@ -31,5 +31,26 @@ include/spark2012/spark-unsigned.adb include/spark2012/spark-unsigned.ads include/spark2012/spark.ads lib/gnat/spark2012.gpr +lib/spark2012/libspark2012.a +lib/spark2012/spark-ada-command_line-unbounded_string.ali +lib/spark2012/spark-ada-command_line.ali +lib/spark2012/spark-ada-containers.ali +lib/spark2012/spark-ada-strings-maps-not_spark.ali +lib/spark2012/spark-ada-strings-maps.ali +lib/spark2012/spark-ada-strings-not_spark.ali +lib/spark2012/spark-ada-strings-unbounded-not_spark.ali +lib/spark2012/spark-ada-strings-unbounded.ali +lib/spark2012/spark-ada-strings.ali +lib/spark2012/spark-ada-text_io-not_spark.ali +lib/spark2012/spark-ada-text_io-unbounded_string.ali +lib/spark2012/spark-ada-text_io.ali +lib/spark2012/spark-ada.ali +lib/spark2012/spark-crypto-debug.ali +lib/spark2012/spark-crypto-hash-skein.ali +lib/spark2012/spark-crypto-hash.ali +lib/spark2012/spark-crypto.ali +lib/spark2012/spark-unsigned.ali +lib/spark2012/spark.ali +@dirrm lib/spark2012 @dirrmtry lib/gnat @dirrm include/spark2012 |