1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-11-22 00:35:15 +00:00

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.
This commit is contained in:
John Marino 2014-05-22 21:44:51 +00:00
parent e5bb7dfcaa
commit 364ab8781f
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=354892
6 changed files with 59 additions and 15 deletions

View File

@ -3,6 +3,7 @@
PORTNAME= gnatcoll
PORTVERSION= 2014
PORTREVISION= 1
CATEGORIES= devel
MASTER_SITES= http://downloads.dragonlace.net/src/
DISTNAME= ${PORTNAME}-gpl-${PORTVERSION}-src

View File

@ -1,13 +0,0 @@
--- src/gnatcoll_tools.gpr.orig 2014-04-10 13:47:58.000000000 +0000
+++ src/gnatcoll_tools.gpr
@@ -33,6 +33,9 @@ project GnatColl_Tools is
package Compiler renames GnatColl_Shared.Compiler;
package Binder renames GnatColl_Shared.Binder;
package Ide renames GnatColl_Shared.Ide;
- package Linker renames GnatColl_Shared.Linker;
+ package Linker is
+ for Leading_Switches ("Ada") use ("gnatcoll/static/set_std_prefix.o",
+ "gnatcoll/static/update_path.o");
+ end Linker;
end GnatColl_Tools;

View File

@ -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}

View File

@ -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

View File

@ -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)
{
}

View File

@ -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;
}