On 01/10 09:32, Marc Espie wrote:
> On Mon, Jan 10, 2011 at 12:28:27PM -0800, Jeremy Evans wrote:
> > On 01/10 09:22, Marc Espie wrote:
> > > On Mon, Jan 10, 2011 at 10:39:23AM -0800, Jeremy Evans wrote:
> > > > On 01/08 09:35, Stuart Henderson wrote:
> > > > > On 2011/01/07 17:08, Jeremy Evans wrote:
> > > > > > Three diffs included. First is llvm-gcc. Second is an updated llvm
> > > > > > diff that should reduce future PLIST churn, requested by Mikolaj
> > > > > > Kucharski. Third is a diff to enable llvm support in rubinius.
> > > > > >
> > > > > > I haven't yet checked to see if any of the llvm-gcc shared libs
> > > > > > should
> > > > > > be bumped. Any advice in this area?
> > > > >
> > > > > Bumping these libs will need some work with the build infrastructure,
> > > > > unfortunately we don't have this under control yet (see notes in
> > > > > llvm-gcc4 Makefile).
> > > >
> > > > Since this isn't under control of the build infrastructure and upstream
> > > > didn't bump them, can we just leave them alone?
> > >
> > > No.
> > >
> > > Upstream(s) are notoriously bad at bumping when need occurs.
> >
> > Any objections to me just bumping the majors on all three shared libs?
> > There aren't any dependencies to worry about.
>
> I would very much like for them to be put under control of the infrastructure,
> as should be.
Done. Can I get an OK to commit to llvm, llvm-gcc, and rubinius?
Jeremy
Index: Makefile
===================================================================
RCS file: /cvs/ports/lang/llvm-gcc4/Makefile,v
retrieving revision 1.13
diff -u -p -r1.13 Makefile
--- Makefile 26 Nov 2010 17:27:38 -0000 1.13
+++ Makefile 10 Jan 2011 22:23:01 -0000
@@ -1,24 +1,23 @@
# $OpenBSD: Makefile,v 1.13 2010/11/26 17:27:38 espie Exp $
# XXX WORK IN PROGRESS.
+SHARED_ONLY = Yes
#ONLY_FOR_ARCHS = ${GCC4_ARCHS}
-ONLY_FOR_ARCHS = i386
-# amd64 has an -fPIC problem
+ONLY_FOR_ARCHS = i386 amd64
# others unknown at this time
COMMENT = gcc4 front-end for LLVM
GCC_V = 4.2.1
-LLVM_V = 2.7
+LLVM_V = 2.8
DISTNAME = llvm-gcc-4.2-${LLVM_V}.source
PKGNAME = ${DISTNAME:S/.source//:S/gcc-/gcc/}
-REVISION = 2
EXTRACT_SUFX= .tgz
-SHARED_LIBS = ssp 0.0 \
- objc 2.0 \
- stdc++ 6.9 # XXX not controllable yet
+SHARED_LIBS = ssp 1.0 \
+ objc 3.0 \
+ stdc++ 7.0
CATEGORIES = lang devel
@@ -71,8 +70,23 @@ MODGNU_CONFIG_GUESS_DIRS = ${WRKSRC} ${W
WRKSRC = ${WRKDIST}/obj
+# See bsd.lib.mk:162
+.if ${MACHINE_ARCH:Mi386*}
+PKG_ARGS+= -Dno_i386=0
+.else
+PKG_ARGS+= -Dno_i386=1
+.endif
+
+LIBTOOLssp_VERSION = ${LIBssp_VERSION:S/./:/}
+LIBTOOLobjc_VERSION = ${LIBobjc_VERSION:S/./:/}
+LIBTOOLstdc++_VERSION = ${LIBstdc++_VERSION:S/./:/}
+SUBST_VARS += LIBTOOLssp_VERSION LIBTOOLobjc_VERSION LIBTOOLstdc++_VERSION
+
post-extract:
@mkdir -p ${WRKSRC}/gcc
+
+pre-configure:
+ ${SUBST_CMD}
${WRKDIST}/lib{{stdc++-v3,objc}/configure,ssp/libtool-version}
post-install:
@chown -R ${BINOWN}:${BINGRP}
${PREFIX}/lib/llvm-gcc-${LLVM_V}/gcc/${CONFIG}/${GCC_V}/include
Index: distinfo
===================================================================
RCS file: /cvs/ports/lang/llvm-gcc4/distinfo,v
retrieving revision 1.4
diff -u -p -r1.4 distinfo
--- distinfo 29 Apr 2010 16:45:53 -0000 1.4
+++ distinfo 8 Jan 2011 00:18:14 -0000
@@ -1,5 +1,5 @@
-MD5 (llvm-gcc-4.2-2.7.source.tgz) = xQMwBc6sGYi3zckIRFCQ8A==
-RMD160 (llvm-gcc-4.2-2.7.source.tgz) = Uj7dlOzgDKqqP/I5nzwLBEtQ9DI=
-SHA1 (llvm-gcc-4.2-2.7.source.tgz) = qvRm76QelQFNUaL4pgrTt3ccGCk=
-SHA256 (llvm-gcc-4.2-2.7.source.tgz) =
HMvO9f5mEzkuJPIf0jqe0mkoJ8E/jYXCazvc0bO1BHo=
-SIZE (llvm-gcc-4.2-2.7.source.tgz) = 55699337
+MD5 (llvm-gcc-4.2-2.8.source.tgz) = 5bBWn18BgIbGIgHYfhYRVA==
+RMD160 (llvm-gcc-4.2-2.8.source.tgz) = MF9BV7FpEoMbK4l7CaVfwkBbzAw=
+SHA1 (llvm-gcc-4.2-2.8.source.tgz) = WPuj3d25xps0XIr6bGmdnZ0T9VE=
+SHA256 (llvm-gcc-4.2-2.8.source.tgz) =
BHhaADHBqh46iZJqxqBpyWJ2B06nEZWDBri/ltnUnk0=
+SIZE (llvm-gcc-4.2-2.8.source.tgz) = 55748118
Index: patches/patch-gcc_cp_call_c
===================================================================
RCS file: /cvs/ports/lang/llvm-gcc4/patches/patch-gcc_cp_call_c,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 patch-gcc_cp_call_c
--- patches/patch-gcc_cp_call_c 22 Jun 2009 22:37:32 -0000 1.1.1.1
+++ patches/patch-gcc_cp_call_c 10 Jan 2011 21:23:19 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-gcc_cp_call_c,v 1.1.1.1 2009/06/22 22:37:32 sthen Exp $
---- gcc/cp/call.c.orig Mon Nov 3 07:33:15 2008
-+++ gcc/cp/call.c Mon Jun 22 00:53:58 2009
-@@ -5414,7 +5414,7 @@ name_as_c_string (tree name, tree type, bool *free_p)
+--- gcc/cp/call.c.orig Fri Aug 6 11:31:05 2010
++++ gcc/cp/call.c Mon Jan 10 12:49:16 2011
+@@ -5418,7 +5418,7 @@ name_as_c_string (tree name, tree type, bool *free_p)
|| name == base_dtor_identifier
|| name == deleting_dtor_identifier)
{
@@ -10,7 +10,7 @@ $OpenBSD: patch-gcc_cp_call_c,v 1.1.1.1
/* Remember that we need to free the memory allocated. */
*free_p = true;
}
-@@ -5424,7 +5424,7 @@ name_as_c_string (tree name, tree type, bool *free_p)
+@@ -5428,7 +5428,7 @@ name_as_c_string (tree name, tree type, bool *free_p)
pretty_name = concat ("operator ",
type_as_string (TREE_TYPE (name),
TFF_PLAIN_IDENTIFIER),
Index: patches/patch-gcc_dbxout_c
===================================================================
RCS file: /cvs/ports/lang/llvm-gcc4/patches/patch-gcc_dbxout_c,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 patch-gcc_dbxout_c
--- patches/patch-gcc_dbxout_c 22 Jun 2009 22:37:32 -0000 1.1.1.1
+++ patches/patch-gcc_dbxout_c 10 Jan 2011 21:23:21 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-gcc_dbxout_c,v 1.1.1.1 2009/06/22 22:37:32 sthen Exp $
---- gcc/dbxout.c.orig Tue Sep 2 23:20:12 2008
-+++ gcc/dbxout.c Mon Jun 22 00:53:59 2009
-@@ -1136,7 +1136,7 @@ dbxout_init (const char *input_file_name)
+--- gcc/dbxout.c.orig Thu May 20 22:58:44 2010
++++ gcc/dbxout.c Mon Jan 10 12:49:16 2011
+@@ -1140,7 +1140,7 @@ dbxout_init (const char *input_file_name)
if (cwd[0] == '\0')
cwd = "/";
else if (!IS_DIR_SEPARATOR (cwd[strlen (cwd) - 1]))
Index: patches/patch-gcc_gcc_c
===================================================================
RCS file: /cvs/ports/lang/llvm-gcc4/patches/patch-gcc_gcc_c,v
retrieving revision 1.3
diff -u -p -r1.3 patch-gcc_gcc_c
--- patches/patch-gcc_gcc_c 29 Apr 2010 16:45:53 -0000 1.3
+++ patches/patch-gcc_gcc_c 10 Jan 2011 21:23:21 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-gcc_gcc_c,v 1.3 2010/04/29 16:45:53 jsg Exp $
---- gcc/gcc.c.orig Sat Dec 19 00:12:36 2009
-+++ gcc/gcc.c Wed Apr 28 23:16:03 2010
-@@ -1408,7 +1408,7 @@ translate_options (int *argcp, const char *const **arg
+--- gcc/gcc.c.orig Mon Aug 30 13:52:59 2010
++++ gcc/gcc.c Mon Jan 10 12:49:16 2011
+@@ -1409,7 +1409,7 @@ translate_options (int *argcp, const char *const **arg
/* Store the translation as one argv elt or as two. */
if (arg != 0 && strchr (arginfo, 'j') != 0)
newv[newindex++] = concat (option_map[j].equivalent, arg,
@@ -10,7 +10,7 @@ $OpenBSD: patch-gcc_gcc_c,v 1.3 2010/04/
else if (arg != 0)
{
newv[newindex++] = option_map[j].equivalent;
-@@ -1748,7 +1748,7 @@ init_gcc_specs (struct obstack *obstack, const char *s
+@@ -1749,7 +1749,7 @@ init_gcc_specs (struct obstack *obstack, const char *s
"%{shared:", shared_name, "}"
#endif
#endif
@@ -19,7 +19,7 @@ $OpenBSD: patch-gcc_gcc_c,v 1.3 2010/04/
obstack_grow (obstack, buf, strlen (buf));
free (buf);
-@@ -1946,7 +1946,7 @@ set_spec (const char *name, const char *spec)
+@@ -1947,7 +1947,7 @@ set_spec (const char *name, const char *spec)
old_spec = *(sl->ptr_spec);
*(sl->ptr_spec) = ((spec[0] == '+' && ISSPACE ((unsigned char)spec[1]))
@@ -28,7 +28,7 @@ $OpenBSD: patch-gcc_gcc_c,v 1.3 2010/04/
: xstrdup (spec));
#ifdef DEBUG_SPECS
-@@ -2516,12 +2516,12 @@ for_each_path (const struct path_prefix *paths,
+@@ -2517,12 +2517,12 @@ for_each_path (const struct path_prefix *paths,
just_multi_suffix = just_machine_suffix;
if (do_multi && multilib_dir && strcmp (multilib_dir, ".") != 0)
{
@@ -45,7 +45,7 @@ $OpenBSD: patch-gcc_gcc_c,v 1.3 2010/04/
while (1)
{
-@@ -2869,8 +2869,8 @@ add_sysrooted_prefix (struct path_prefix *pprefix, con
+@@ -2870,8 +2870,8 @@ add_sysrooted_prefix (struct path_prefix *pprefix, con
if (target_system_root)
{
if (target_sysroot_suffix)
@@ -56,7 +56,7 @@ $OpenBSD: patch-gcc_gcc_c,v 1.3 2010/04/
/* We have to override this because GCC's notion of sysroot
moves along with GCC. */
-@@ -3517,7 +3517,7 @@ process_command (int argc, const char **argv)
+@@ -3518,7 +3518,7 @@ process_command (int argc, const char **argv)
break;
new_argv0 = xmemdup (progname, baselen,
baselen + concat_length (new_version, new_machine,
@@ -65,7 +65,7 @@ $OpenBSD: patch-gcc_gcc_c,v 1.3 2010/04/
strcpy (new_argv0 + baselen, new_machine);
strcat (new_argv0, "-gcc-");
strcat (new_argv0, new_version);
-@@ -3571,7 +3571,7 @@ process_command (int argc, const char **argv)
+@@ -3572,7 +3572,7 @@ process_command (int argc, const char **argv)
standard_libexec_prefix);
/* LLVM LOCAL end no-canonical-prefixes */
if (gcc_exec_prefix)
@@ -74,7 +74,7 @@ $OpenBSD: patch-gcc_gcc_c,v 1.3 2010/04/
}
else
{
-@@ -3579,7 +3579,7 @@ process_command (int argc, const char **argv)
+@@ -3580,7 +3580,7 @@ process_command (int argc, const char **argv)
GCC_EXEC_PREFIX is typically a directory name with a trailing
/ (which is ignored by make_relative_prefix), so append a
program name. */
@@ -83,7 +83,7 @@ $OpenBSD: patch-gcc_gcc_c,v 1.3 2010/04/
/* LLVM LOCAL begin no-canonical-prefixes */
gcc_libexec_prefix = get_relative_prefix (tmp_prefix,
standard_exec_prefix,
-@@ -3628,7 +3628,7 @@ process_command (int argc, const char **argv)
+@@ -3629,7 +3629,7 @@ process_command (int argc, const char **argv)
{
strncpy (nstore, startp, endp - startp);
if (endp == startp)
@@ -92,7 +92,7 @@ $OpenBSD: patch-gcc_gcc_c,v 1.3 2010/04/
else if (!IS_DIR_SEPARATOR (endp[-1]))
{
nstore[endp - startp] = DIR_SEPARATOR;
-@@ -3662,7 +3662,7 @@ process_command (int argc, const char **argv)
+@@ -3663,7 +3663,7 @@ process_command (int argc, const char **argv)
{
strncpy (nstore, startp, endp - startp);
if (endp == startp)
@@ -101,7 +101,7 @@ $OpenBSD: patch-gcc_gcc_c,v 1.3 2010/04/
else if (!IS_DIR_SEPARATOR (endp[-1]))
{
nstore[endp - startp] = DIR_SEPARATOR;
-@@ -3695,7 +3695,7 @@ process_command (int argc, const char **argv)
+@@ -3696,7 +3696,7 @@ process_command (int argc, const char **argv)
{
strncpy (nstore, startp, endp - startp);
if (endp == startp)
@@ -110,7 +110,7 @@ $OpenBSD: patch-gcc_gcc_c,v 1.3 2010/04/
else if (!IS_DIR_SEPARATOR (endp[-1]))
{
nstore[endp - startp] = DIR_SEPARATOR;
-@@ -4220,7 +4220,7 @@ warranty; not even for MERCHANTABILITY or FITNESS FOR
+@@ -4221,7 +4221,7 @@ warranty; not even for MERCHANTABILITY or FITNESS FOR
PREFIX_PRIORITY_LAST, 1, 0);
tooldir_prefix = concat (tooldir_base_prefix, spec_machine,
@@ -119,7 +119,7 @@ $OpenBSD: patch-gcc_gcc_c,v 1.3 2010/04/
/* If tooldir is relative, base it on exec_prefixes. A relative
tooldir lets us move the installed tree as a unit.
-@@ -4235,28 +4235,28 @@ warranty; not even for MERCHANTABILITY or FITNESS FOR
+@@ -4236,28 +4236,28 @@ warranty; not even for MERCHANTABILITY or FITNESS FOR
{
char *gcc_exec_tooldir_prefix
= concat (gcc_exec_prefix, spec_machine, dir_separator_str,
@@ -154,7 +154,7 @@ $OpenBSD: patch-gcc_gcc_c,v 1.3 2010/04/
"BINUTILS", PREFIX_PRIORITY_LAST, 0, 1);
#if defined(TARGET_SYSTEM_ROOT_RELOCATABLE) && !defined(VMS)
-@@ -4386,7 +4386,7 @@ warranty; not even for MERCHANTABILITY or FITNESS FOR
+@@ -4387,7 +4387,7 @@ warranty; not even for MERCHANTABILITY or FITNESS FOR
{ /* POSIX allows separation of -l and the lib arg;
canonicalize by concatenating -l with its arg */
infiles[n_infiles].language = "*";
@@ -163,7 +163,7 @@ $OpenBSD: patch-gcc_gcc_c,v 1.3 2010/04/
}
else if (strncmp (argv[i], "-l", 2) == 0)
{
-@@ -6666,8 +6666,8 @@ main (int argc, char **argv)
+@@ -6667,8 +6667,8 @@ main (int argc, char **argv)
/* Read specs from a file if there is one. */
machine_suffix = concat (spec_machine, dir_separator_str,
@@ -174,7 +174,7 @@ $OpenBSD: patch-gcc_gcc_c,v 1.3 2010/04/
specs_file = find_a_file (&startfile_prefixes, "specs", R_OK, true);
/* Read the specs file unless it is a default one. */
-@@ -6791,7 +6791,7 @@ main (int argc, char **argv)
+@@ -6792,7 +6792,7 @@ main (int argc, char **argv)
if (gcc_exec_prefix)
add_prefix (&startfile_prefixes,
concat (gcc_exec_prefix, machine_suffix,
@@ -183,7 +183,7 @@ $OpenBSD: patch-gcc_gcc_c,v 1.3 2010/04/
NULL, PREFIX_PRIORITY_LAST, 0, 1);
/* APPLE LOCAL begin ARM sysroot startfile_prefixes */
-@@ -6801,13 +6801,13 @@ main (int argc, char **argv)
+@@ -6802,13 +6802,13 @@ main (int argc, char **argv)
add_sysrooted_prefix (&startfile_prefixes,
concat (standard_exec_prefix,
machine_suffix,
@@ -199,7 +199,7 @@ $OpenBSD: patch-gcc_gcc_c,v 1.3 2010/04/
NULL, PREFIX_PRIORITY_LAST, 0, 1);
/* APPLE LOCAL end ARM sysroot startfile_prefixes */
}
-@@ -6836,7 +6836,7 @@ main (int argc, char **argv)
+@@ -6837,7 +6837,7 @@ main (int argc, char **argv)
/* If we have a GCC_EXEC_PREFIX envvar, modify it for cpp's sake. */
if (gcc_exec_prefix)
gcc_exec_prefix = concat (gcc_exec_prefix, spec_machine,
dir_separator_str,
Index: patches/patch-gcc_tree_c
===================================================================
RCS file: /cvs/ports/lang/llvm-gcc4/patches/patch-gcc_tree_c,v
retrieving revision 1.3
diff -u -p -r1.3 patch-gcc_tree_c
--- patches/patch-gcc_tree_c 29 Apr 2010 16:45:53 -0000 1.3
+++ patches/patch-gcc_tree_c 10 Jan 2011 21:23:22 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-gcc_tree_c,v 1.3 2010/04/29 16:45:53 jsg Exp $
---- gcc/tree.c.orig Thu Mar 4 00:20:17 2010
-+++ gcc/tree.c Wed Apr 28 23:09:28 2010
-@@ -6933,11 +6933,11 @@ build_common_builtin_nodes (void)
+--- gcc/tree.c.orig Mon May 24 13:19:31 2010
++++ gcc/tree.c Mon Jan 10 12:49:16 2011
+@@ -6935,11 +6935,11 @@ build_common_builtin_nodes (void)
*q = TOLOWER (*p);
*q = '\0';
Index: patches/patch-libobjc_configure
===================================================================
RCS file: patches/patch-libobjc_configure
diff -N patches/patch-libobjc_configure
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-libobjc_configure 10 Jan 2011 21:33:05 -0000
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- libobjc/configure.orig Mon Jan 10 13:10:39 2011
++++ libobjc/configure Mon Jan 10 13:11:51 2011
+@@ -1422,7 +1422,7 @@ target_subdir=${target_noncanonical}
+ # We need the following definitions because AC_PROG_LIBTOOL relies on them
+ PACKAGE=libobjc
+ # Version is pulled out to make it a bit easier to change using sed.
+-VERSION=2:0:0
++VERSION=${LIBTOOLobjc_VERSION}:0
+
+
+ # This works around the fact that libtool configuration may change LD
Index: patches/patch-libssp_libtool-version
===================================================================
RCS file: patches/patch-libssp_libtool-version
diff -N patches/patch-libssp_libtool-version
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-libssp_libtool-version 10 Jan 2011 21:32:50 -0000
@@ -0,0 +1,9 @@
+$OpenBSD$
+--- libssp/libtool-version.orig Mon Jan 10 13:21:57 2011
++++ libssp/libtool-version Mon Jan 10 13:22:38 2011
+@@ -3,4 +3,4 @@
+ # a separate file so that version updates don't involve re-running
+ # automake.
+ # CURRENT:REVISION:AGE
+-0:0:0
++${LIBTOOLssp_VERSION}:0
Index: patches/patch-libstdc++-v3_configure
===================================================================
RCS file: patches/patch-libstdc++-v3_configure
diff -N patches/patch-libstdc++-v3_configure
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-libstdc++-v3_configure 10 Jan 2011 21:33:24 -0000
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- libstdc++-v3/configure.orig Mon Jan 10 13:08:39 2011
++++ libstdc++-v3/configure Mon Jan 10 13:12:23 2011
+@@ -1378,7 +1378,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+ ### am handles this now? ORIGINAL_LD_FOR_MULTILIBS=$LD
+
+ # For libtool versioning info, format is CURRENT:REVISION:AGE
+-libtool_VERSION=6:9:0
++libtool_VERSION=${LIBTOOLstdc++_VERSION}:0
+
+
+ # Find the rest of the source tree framework.
Index: pkg/PFRAG.no_i386
===================================================================
RCS file: pkg/PFRAG.no_i386
diff -N pkg/PFRAG.no_i386
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ pkg/PFRAG.no_i386 10 Jan 2011 18:22:03 -0000
@@ -0,0 +1,40 @@
+...@comment $OpenBSD: PLIST,v 1.2 2009/06/24 20:10:10 sthen Exp $
+lib/llvm-gcc-${LLVM_V}/fpic/
+lib/llvm-gcc-${LLVM_V}/fpic/libesupc++.a
+lib/llvm-gcc-${LLVM_V}/fpic/libesupc++.la
+lib/llvm-gcc-${LLVM_V}/fpic/libiberty.a
+lib/llvm-gcc-${LLVM_V}/fpic/libobjc.a
+lib/llvm-gcc-${LLVM_V}/fpic/libobjc.la
+...@lib lib/llvm-gcc-${LLVM_V}/fpic/libobjc.so.${LIBobjc_VERSION}
+lib/llvm-gcc-${LLVM_V}/fpic/libssp.a
+lib/llvm-gcc-${LLVM_V}/fpic/libssp.la
+...@lib lib/llvm-gcc-${LLVM_V}/fpic/libssp.so.${LIBssp_VERSION}
+lib/llvm-gcc-${LLVM_V}/fpic/libssp_nonshared.a
+lib/llvm-gcc-${LLVM_V}/fpic/libssp_nonshared.la
+lib/llvm-gcc-${LLVM_V}/fpic/libstdc++.a
+lib/llvm-gcc-${LLVM_V}/fpic/libstdc++.la
+...@lib lib/llvm-gcc-${LLVM_V}/fpic/libstdc++.so.${LIBstdc++_VERSION}
+lib/llvm-gcc-${LLVM_V}/gcc/${CONFIG}/${GCC_V}/fpic/
+lib/llvm-gcc-${LLVM_V}/gcc/${CONFIG}/${GCC_V}/fpic/libgcc.a
+lib/llvm-gcc-${LLVM_V}/gcc/${CONFIG}/${GCC_V}/fpic/libgcov.a
+lib/llvm-gcc-${LLVM_V}/include/c++/${CONFIG}/fpic/
+lib/llvm-gcc-${LLVM_V}/include/c++/${CONFIG}/fpic/bits/
+lib/llvm-gcc-${LLVM_V}/include/c++/${CONFIG}/fpic/bits/atomic_word.h
+lib/llvm-gcc-${LLVM_V}/include/c++/${CONFIG}/fpic/bits/basic_file.h
+lib/llvm-gcc-${LLVM_V}/include/c++/${CONFIG}/fpic/bits/c++allocator.h
+lib/llvm-gcc-${LLVM_V}/include/c++/${CONFIG}/fpic/bits/c++config.h
+lib/llvm-gcc-${LLVM_V}/include/c++/${CONFIG}/fpic/bits/c++io.h
+lib/llvm-gcc-${LLVM_V}/include/c++/${CONFIG}/fpic/bits/c++locale.h
+lib/llvm-gcc-${LLVM_V}/include/c++/${CONFIG}/fpic/bits/cpu_defines.h
+lib/llvm-gcc-${LLVM_V}/include/c++/${CONFIG}/fpic/bits/ctype_base.h
+lib/llvm-gcc-${LLVM_V}/include/c++/${CONFIG}/fpic/bits/ctype_inline.h
+lib/llvm-gcc-${LLVM_V}/include/c++/${CONFIG}/fpic/bits/ctype_noninline.h
+lib/llvm-gcc-${LLVM_V}/include/c++/${CONFIG}/fpic/bits/cxxabi_tweaks.h
+lib/llvm-gcc-${LLVM_V}/include/c++/${CONFIG}/fpic/bits/gthr-default.h
+lib/llvm-gcc-${LLVM_V}/include/c++/${CONFIG}/fpic/bits/gthr-posix.h
+lib/llvm-gcc-${LLVM_V}/include/c++/${CONFIG}/fpic/bits/gthr-single.h
+lib/llvm-gcc-${LLVM_V}/include/c++/${CONFIG}/fpic/bits/gthr-tpf.h
+lib/llvm-gcc-${LLVM_V}/include/c++/${CONFIG}/fpic/bits/gthr.h
+lib/llvm-gcc-${LLVM_V}/include/c++/${CONFIG}/fpic/bits/messages_members.h
+lib/llvm-gcc-${LLVM_V}/include/c++/${CONFIG}/fpic/bits/os_defines.h
+lib/llvm-gcc-${LLVM_V}/include/c++/${CONFIG}/fpic/bits/time_members.h
Index: pkg/PFRAG.shared
===================================================================
RCS file: pkg/PFRAG.shared
diff -N pkg/PFRAG.shared
--- pkg/PFRAG.shared 24 Jun 2009 20:10:10 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,4 +0,0 @@
-...@comment $OpenBSD: PFRAG.shared,v 1.2 2009/06/24 20:10:10 sthen Exp $
-...@lib lib/llvm-gcc-${LLVM_V}/libobjc.so.${LIBobjc_VERSION}
-...@lib lib/llvm-gcc-${LLVM_V}/libssp.so.${LIBssp_VERSION}
-...@lib lib/llvm-gcc-${LLVM_V}/libstdc++.so.${LIBstdc++_VERSION}
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/lang/llvm-gcc4/pkg/PLIST,v
retrieving revision 1.2
diff -u -p -r1.2 PLIST
--- pkg/PLIST 24 Jun 2009 20:10:10 -0000 1.2
+++ pkg/PLIST 10 Jan 2011 18:21:04 -0000
@@ -1,5 +1,4 @@
@comment $OpenBSD: PLIST,v 1.2 2009/06/24 20:10:10 sthen Exp $
-%%SHARED%%
@bin bin/${CONFIG}-cpp-${GCC_V}
@bin bin/${CONFIG}-gcc-${GCC_V}
@bin bin/${CONFIG}-llvm-c++
@@ -681,12 +680,15 @@ lib/llvm-gcc-${LLVM_V}/libesupc++.la
lib/llvm-gcc-${LLVM_V}/libiberty.a
lib/llvm-gcc-${LLVM_V}/libobjc.a
lib/llvm-gcc-${LLVM_V}/libobjc.la
+...@lib lib/llvm-gcc-${LLVM_V}/libobjc.so.${LIBobjc_VERSION}
lib/llvm-gcc-${LLVM_V}/libssp.a
lib/llvm-gcc-${LLVM_V}/libssp.la
+...@lib lib/llvm-gcc-${LLVM_V}/libssp.so.${LIBssp_VERSION}
lib/llvm-gcc-${LLVM_V}/libssp_nonshared.a
lib/llvm-gcc-${LLVM_V}/libssp_nonshared.la
lib/llvm-gcc-${LLVM_V}/libstdc++.a
lib/llvm-gcc-${LLVM_V}/libstdc++.la
+...@lib lib/llvm-gcc-${LLVM_V}/libstdc++.so.${LIBstdc++_VERSION}
@man man/man1/llvm-cpp.1
@man man/man1/llvm-g++.1
@man man/man1/llvm-gcc.1
