lang/gnat_util: Add set_std_prefix and update_path symbols

Rather than require each user of libgnat_util to link in set_std_prefix
and update_path functions, let's assume each user needs the same version
of these functions and just add them directly to the library.

Adjust gnatcoll accordingly -- hack no longer necessary.

4 files changed, 58 insertions, 2 deletions

diff --git a/lang/gnat_util/Makefile b/lang/gnat_util/Makefile
index 363481fa743d..e67f31d58e14 100644
--- a/lang/gnat_util/Makefile
+++ b/lang/gnat_util/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	gnat_util
 PORTVERSION=	${SNAPSHOT}
+PORTREVISION=	1
 CATEGORIES=	lang
 MASTER_SITES=	${MASTER_SITE_GCC}
 MASTER_SITE_SUBDIR= ${MS_SUBDIR}
@@ -25,7 +26,8 @@ MAKE_ENV=	MAKEOBJDIR=${WRKSRC}/obj
 
 post-extract:
 	@${MKDIR} ${WRKSRC}/obj
-.for F in Makefile gnat_util.gpr sdefault_adb.gnat_util
+.for F in Makefile gnat_util.gpr sdefault_adb.gnat_util \
+	update_path.c set_std_prefix.c
 	@${CP} ${FILESDIR}/${F} ${WRKSRC}/
 .endfor
 .for F in ${GNAT_SRCS}
diff --git a/lang/gnat_util/files/Makefile b/lang/gnat_util/files/Makefile
index 9112b7235a26..38ef037176ab 100644
--- a/lang/gnat_util/files/Makefile
+++ b/lang/gnat_util/files/Makefile
@@ -10,7 +10,8 @@ C_FLAGS=	-O2
 ADB_SRCS!=	cd ${.CURDIR} && ls *.adb | sort -r
 GEN_SRCS=	sdefault.adb snames.adb xsnamest.adb
 ADS_SRCS=	rident.ads hostparm.ads err_vars.ads alloc.ads prj-com.ads
-LIB_SRCS+=	link.c ${GEN_SRCS} ${ADS_SRCS} ${ADB_SRCS:Nlib-*.adb}
+C_SRCS=		link.c update_path.c set_std_prefix.c
+LIB_SRCS+=	${C_SRCS} ${GEN_SRCS} ${ADS_SRCS} ${ADB_SRCS:Nlib-*.adb}
 LIB_OBJS=	${LIB_SRCS:R:S/$/.o/}
 
 .PHONY: all
diff --git a/lang/gnat_util/files/set_std_prefix.c b/lang/gnat_util/files/set_std_prefix.c
new file mode 100644
index 000000000000..5c28bb3b5e3b
--- /dev/null
+++ b/lang/gnat_util/files/set_std_prefix.c
@@ -0,0 +1,26 @@
+/*********************************************************************
+ *                               G P S                               *
+ *                                                                   *
+ *                      Copyright (C) 2002-2004                      *
+ *                            ACT-Europe                             *
+ *                                                                   *
+ * GPS is free  software;  you can redistribute it and/or modify  it *
+ * under the terms of the GNU General Public License as published by *
+ * the Free Software Foundation; either version 2 of the License, or *
+ * (at your option) any later version.                               *
+ *                                                                   *
+ * This program is  distributed in the hope that it will be  useful, *
+ * but  WITHOUT ANY WARRANTY;  without even the  implied warranty of *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU *
+ * General Public License for more details. You should have received *
+ * a copy of the GNU General Public License along with this program; *
+ * if not,  write to the  Free Software Foundation, Inc.,  59 Temple *
+ * Place - Suite 330, Boston, MA 02111-1307, USA.                    *
+ *********************************************************************/
+
+/* Dummy version of set_std_prefix (needed by osint.adb) */
+
+void
+set_std_prefix (char *path, int len)
+{
+}
diff --git a/lang/gnat_util/files/update_path.c b/lang/gnat_util/files/update_path.c
new file mode 100644
index 000000000000..ee4ab484a084
--- /dev/null
+++ b/lang/gnat_util/files/update_path.c
@@ -0,0 +1,27 @@
+/*********************************************************************
+ *                               G P S                               *
+ *                                                                   *
+ *                      Copyright (C) 2002-2004                      *
+ *                            ACT-Europe                             *
+ *                                                                   *
+ * GPS is free  software;  you can redistribute it and/or modify  it *
+ * under the terms of the GNU General Public License as published by *
+ * the Free Software Foundation; either version 2 of the License, or *
+ * (at your option) any later version.                               *
+ *                                                                   *
+ * This program is  distributed in the hope that it will be  useful, *
+ * but  WITHOUT ANY WARRANTY;  without even the  implied warranty of *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU *
+ * General Public License for more details. You should have received *
+ * a copy of the GNU General Public License along with this program; *
+ * if not,  write to the  Free Software Foundation, Inc.,  59 Temple *
+ * Place - Suite 330, Boston, MA 02111-1307, USA.                    *
+ *********************************************************************/
+
+/* Dummy version of update_path (needed by osint.adb) */
+
+char *
+update_path (char *path, char *key)
+{
+  return path;
+}