cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Put shared libraries into a separate fragment.

Browse Source
This commit is contained in:
espie 2000-07-03 13:01:47 +00:00
parent 049bb6f8bb
commit 5e279084af
2 changed files with 32 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
infrastructure/install/make-plist
View File

@ -1,6 +1,6 @@
#!/usr/bin/perl -w
# $OpenBSD: make-plist,v 1.5 2000/06/30 23:45:41 espie Exp $
# $OpenBSD: make-plist,v 1.6 2000/07/03 13:01:49 espie Exp $
# Copyright (c) 1999 Marc Espie
#
@ -39,7 +39,15 @@ use strict;
use File::Find;
my (%newdir, %occupied, %ldconfig, %has_stuff, %infodir, @files);
my ($plist, $pshared);
my (%newdir, %occupied, %ldconfig, %has_stuff, %infodir, @files, @libfiles);
die "Update bsd.port.mk" if @ARGV == 0;
$plist = shift;
$pshared = $plist;
$pshared =~ s/PLIST/PFRAG.shared/;
open(PLIST, ">$plist-auto") or die "Can't write to $plist-auto";
select PLIST;
print "\@comment \$OpenBSD\$\n";
@ -94,7 +102,6 @@ sub add_info {
}
}
# recursive traversal: mark specific `info' dirs, `ldconfig' dirs,
# and potentially modified dirs
@ -106,10 +113,11 @@ find(
if (-d _) {
$newdir{$File::Find::name} = 1;
} else {
push(@files, $File::Find::name);
if (/\.so\.\d+\.\d+$/) {
$ldconfig{$File::Find::dir} = 1;
push(@libfiles, $File::Find::name);
}
push(@files, $File::Find::name);
if (/\.info$/) {
my $d = $File::Find::dir;
$infodir{$d} = [] unless defined $infodir{$d};
@ -143,6 +151,23 @@ for my $f (sort @files) {
print strip($f), "\n" unless ($f =~ m|/dir$|) && (defined $infodir{$`});
}
if (@libfiles > 0) {
print "\%\%SHARED\%\%\n";
open(SHARED, ">$pshared-auto") or die "Can't write to $pshared-auto";
print SHARED "\@comment \$OpenBSD\$\n";
for my $f (sort @libfiles) {
print SHARED strip($f), "\n";
}
for my $d (sort (keys %ldconfig)) {
if (defined $newdir{$d}) {
print SHARED "NEWDYNLIBDIR(", strip($d), ")\n";
} else {
print SHARED "DYNLIBDIR(", strip($d), ")\n";
}
}
close SHARED;
}
for my $d (sort { $b cmp $a } (grep { $newdir{$_} } (keys %newdir) ) ) {
# case of new directory that does not hold anything: it's marked
# for removal, but it must exist first
@ -152,12 +177,4 @@ for my $d (sort { $b cmp $a } (grep { $newdir{$_} } (keys %newdir) ) ) {
print "\@dirrm ",strip($d), "\n";
}
for my $d (sort (keys %ldconfig)) {
if (defined $newdir{$d}) {
print "NEWDYNLIBDIR(", strip($d), ")\n";
} else {
print "DYNLIBDIR(", strip($d), ")\n";
}
}
add_info('@exec install-info', \%infodir);

6
infrastructure/mk/bsd.port.mk
View File

@ -1,6 +1,6 @@
#-*- mode: Fundamental; tab-width: 4; -*-
# ex:ts=4 sw=4 filetype=make:
FULL_REVISION=$$OpenBSD: bsd.port.mk,v 1.311 2000/06/30 21:48:50 espie Exp $$
FULL_REVISION=$$OpenBSD: bsd.port.mk,v 1.312 2000/07/03 13:01:47 espie Exp $$
# $FreeBSD: bsd.port.mk,v 1.264 1996/12/25 02:27:44 imp Exp $
# $NetBSD: bsd.port.mk,v 1.62 1998/04/09 12:47:02 hubertf Exp $
#
@ -2087,7 +2087,7 @@ plist: fake
@DESTDIR=${WRKINST} PREFIX=${WRKINST}${PREFIX} LDCONFIG="${LDCONFIG}" \
MTREE_FILE=${PORTSDIR}/infrastructure/db/fake.mtree \
INSTALL_PRE_COOKIE=${_INSTALL_PRE_COOKIE} \
perl ${PORTSDIR}/infrastructure/install/make-plist > ${PLIST}-auto
perl ${PORTSDIR}/infrastructure/install/make-plist ${PLIST}
.else
# Figure out where the local mtree file is
@ -2100,7 +2100,7 @@ MTREE_FILE?= /etc/mtree/BSD.x11.dist
plist: install
@DESTDIR=${PREFIX} PREFIX=${PREFIX} LDCONFIG="${LDCONFIG}" MTREE_FILE=${MTREE_FILE} \
INSTALL_PRE_COOKIE=${_INSTALL_PRE_COOKIE} \
perl ${PORTSDIR}/infrastructure/install/make-plist > ${PLIST}-auto
perl ${PORTSDIR}/infrastructure/install/make-plist ${PLIST}
.endif
update-patches: