kill remnants of non shared arches

2 files changed, 4 insertions, 84 deletions

diff --git a/usr.sbin/pkg_add/OpenBSD/PkgCreate.pm b/usr.sbin/pkg_add/OpenBSD/PkgCreate.pm
index 45d3a42d3a9..47ce044eb35 100644
--- a/usr.sbin/pkg_add/OpenBSD/PkgCreate.pm
+++ b/usr.sbin/pkg_add/OpenBSD/PkgCreate.pm
@@ -1,6 +1,6 @@
 #! /usr/bin/perl
 # ex:ts=8 sw=4:
-# $OpenBSD: PkgCreate.pm,v 1.119 2016/04/02 12:18:44 espie Exp $
+# $OpenBSD: PkgCreate.pm,v 1.120 2016/04/25 10:12:58 espie Exp $
 #
 # Copyright (c) 2003-2014 Marc Espie <espie@openbsd.org>
 #
@@ -308,10 +308,6 @@ sub check_version
 {
 }
 
-sub find_every_library
-{
-}
-
 package OpenBSD::PackingElement::StreamMarker;
 our @ISA = qw(OpenBSD::PackingElement::Meta);
 sub new
@@ -515,14 +511,6 @@ sub verify_checksum
 	$self->verify_checksum_with_base($state, $state->{base});
 }
 
-sub find_every_library
-{
-	my ($self, $h) = @_;
-	if ($self->fullname =~ m,/lib([^/]+)\.a$,) {
-		$h->{$1}{static} = 1;
-	}
-}
-
 package OpenBSD::PackingElement::Dir;
 sub discover_directories
 {
@@ -682,13 +670,6 @@ sub check_version
 	$state->{has_libraries} = 1;
 }
 
-sub find_every_library
-{
-	my ($self, $h) = @_;
-	my @l = $self->parse($self->fullname);
-	push(@{$h->{$l[0]}{dynamic}}, $self);
-}
-
 package OpenBSD::PackingElement::DigitalSignature;
 sub is_forbidden() { 1 }
 
@@ -1048,10 +1029,6 @@ sub handle_fragment
 {
 	my ($self, $state, $old, $not, $frag, undef, $cont) = @_;
 	my $def = $frag;
-	if ($frag eq 'SHARED') {
-		$def = 'SHARED_LIBS';
-		$frag = 'shared';
-	}
 	if ($state->{subst}->has_fragment($def, $frag)) {
 		return undef if defined $not;
 	} else {
@@ -1363,28 +1340,6 @@ sub finish_manpages
 	}
 }
 
-# This converts shared libraries into non-shared libraries if necessary
-sub tweak_libraries
-{
-	my ($self, $state, $plist) = @_;
-	return unless $state->{has_libraries};
-	return if $state->{subst}->has_fragment('SHARED_LIBS', 'shared');
-	my $h = {};
-	$plist->find_every_library($h);
-	# now we have each library recorded by "stem"
-	while (my ($k, $v) = each %$h) {
-		# need a static one: convert the first dynamic library to static
-		if (!defined $v->{static}) {
-			my $lib = pop @{$v->{dynamic}};
-			$lib->{name} = "lib/lib$k.a";
-			bless $lib, "OpenBSD::PackingElement::File";
-		}
-		for my $lib (@{$v->{dynamic}}) {
-			$lib->remove($plist);
-		}
-	}
-}
-
 sub save_history
 {
 	my ($self, $plist, $dir) = @_;
@@ -1503,7 +1458,6 @@ sub parse_and_run
 
 
 	$plist->discover_directories($state);
-	$self->tweak_libraries($state, $plist);
 	my $ordered;
 	unless (defined $state->opt('q') && defined $state->opt('n')) {
 		$state->set_status("checking dependencies");
diff --git a/usr.sbin/pkg_add/pkg_create.1 b/usr.sbin/pkg_add/pkg_create.1
index c5d467e5eb5..71f8816e91b 100644
--- a/usr.sbin/pkg_add/pkg_create.1
+++ b/usr.sbin/pkg_add/pkg_create.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: pkg_create.1,v 1.99 2015/09/15 17:20:53 schwarze Exp $
+.\"	$OpenBSD: pkg_create.1,v 1.100 2016/04/25 10:12:58 espie Exp $
 .\"
 .\" Documentation and design originally from FreeBSD. All the code has
 .\" been rewritten since. We keep the documentation's notice:
@@ -21,7 +21,7 @@
 .\" [jkh] Took John's changes back and made some additional extensions for
 .\" better integration with FreeBSD's new ports collection.
 .\"
-.Dd $Mdocdate: September 15 2015 $
+.Dd $Mdocdate: April 25 2016 $
 .Dt PKG_CREATE 1
 .Os
 .Sh NAME
@@ -802,10 +802,7 @@ will take its version number from
 The ports framework normally takes care of all details, see
 .Ev SHARED_LIBS
 in
-.Xr bsd.port.mk 5 ,
-not to be confused with
-.Va SHARED_LIBS
-later in this document.
+.Xr bsd.port.mk 5 .
 .Pp
 Constructs like
 .Li %%VAR%%
@@ -856,37 +853,6 @@ inclusion will be ignored.
 However, if both the positive and negative fragment files do not exist,
 .Nm
 will error out, to make it easier to spot fragment names errors.
-.Pp
-Shared libraries no longer require any fragments, but can be included directly
-in the final packing-list:
-on an architecture without shared libraries,
-.Li @lib lib/libfoo.so.${LIBfoo_VERSION}
-will automatically devolve into
-.Li lib/libfoo.a ,
-if needed (e.g., for a port that builds both a shared library and a normal
-library on a shared libraries architecture,
-.Li @lib lib/libfoo.so.${LIBfoo_VERSION}
-will simply vanish on non-shared architectures).
-Extra copies living in other directories will be ignored
-.Po
-See the description of
-.Ev SHARED_ONLY
-and
-.Ev NO_SHARED_LIBS
-in
-.Xr bsd.port.mk 5
-.Pc .
-.Pp
-As a special historical exception, the variable
-.Va SHARED_LIBS
-still control the inclusion of fragments
-.Pa PFRAG.shared
-and
-.Pa PFRAG.no-shared
-through the lines
-.Li %%SHARED%%
-and
-.Li !%%SHARED%% .
 .Sh ENVIRONMENT
 .Bl -tag -width PKG_DESTDIR
 .It Ev PKG_DESTDIR