Permalink
Browse files

Merging shlibs code from shlibs branch which will now be discontinued

  • Loading branch information...
TheSin- committed Feb 24, 2005
1 parent 726a6d6 commit 28b27e83bfd64ebfd57bb89fd4c9d90657f14e5b
View
@@ -8,6 +8,10 @@
* Updated the full directory to bootstrap with libncurses5 instead
of ncurses
+2004-02-08 Justin F. Hallett <thesin@users.sourceforge.net>
+
+ * all packages: changed to use new AddShlibDeps field
+
2005-01-20 Peter O'Gorman <ogorman@users.sourceforge.net>
* storable-pm.info: allow perl 5.8.6
@@ -41,7 +45,11 @@
* dpkg.info, dpkg.patch, dpkg-bootstrap.info: fix hardcoded /sw
in patch, make flat namespace.
-
+
+2003-12-05 Justin F. Hallett <thesin@users.sourceforge.net>
+
+ * all packages: changed Depends field to use ${SHLIB_DEPS}
+
2003-11-16 Dave Morrison <dmrrsn@users.sourceforge.net>
* system-perl*: removed these, which are no longer needed with
View
@@ -4,6 +4,7 @@ Revision: 51
GCC: 3.3
Depends: %N-shlibs (= %v-%r)
BuildDepends: fink-prebinding, gcc3.3
+AddShlibDeps: true
Source: mirror:sourceforge:fink/%n_%v.tar.gz
Source-MD5: 274fb64e2e67318b4c9c94599785c37d
SourceDirectory: %n-%v
@@ -72,6 +73,7 @@ InstallScript: <<
SplitOff: <<
Package: %N-shlibs
Depends: dpkg, fink (>> 0.20.6-1)
+ AddShlibDeps: true
Replaces: %N (<= 0.5.4-1)
Files: lib/libapt-inst.1.0.0.dylib lib/libapt-pkg.3.2.0.dylib lib/libapt-inst.1.0.dylib lib/libapt-pkg.3.2.dylib
Shlibs: <<
@@ -83,6 +85,7 @@ SplitOff: <<
SplitOff2: <<
Package: %N-dev
Depends: %N-shlibs (= %v-%r)
+ AddShlibDeps: true
BuildDependsOnly: true
Files: lib/libapt-inst.dylib lib/libapt-pkg.dylib include
DocFiles: COPYING* AUTHORS
View
@@ -1,6 +1,7 @@
Package: base-files
Version: 1.9.4
Revision: 1
+AddShlibDeps: true
Source: mirror:custom:fink/%n-%v.tar.gz
Essential: yes
View
@@ -4,6 +4,7 @@ Revision: 12
Essential: yes
Depends: %N-shlibs (= %v-%r)
BuildDepends: fink (>= 0.13.0), fink-prebinding
+AddShlibDeps: true
Maintainer: Fink Core Group <fink-core@lists.sourceforge.net>
Source: mirror:sourceforge:fink/%n-%v.tar.gz
Source-MD5: ee76864958d568677f03db8afad92beb
@@ -15,6 +16,7 @@ SplitOff: <<
Package: %N-shlibs
Replaces: %N (<= 1.0.2-1)
Depends: base-files
+ AddShlibDeps: true
Essential: true
Files: lib/libbz2.*.dylib
Shlibs: %p/lib/libbz2.1.dylib 1.0.1 %n (>= 1.0.2-2)
@@ -24,6 +26,7 @@ SplitOff: <<
SplitOff2: <<
Package: %N-dev
Depends: %N-shlibs (= %v-%r)
+ AddShlibDeps: true
Replaces: %N (<= 1.0.2-1)
BuildDependsOnly: true
Files: include lib/libbz2.dylib
View
@@ -10,6 +10,7 @@ Patch: %n.patch
Essential: yes
Depends: base-files
BuildDepends: gcc3.3
+AddShlibDeps: true
SetCC: gcc-3.3
SetCXX: g++-3.3
CompileScript: <<
View
@@ -5,6 +5,7 @@ Essential: true
Maintainer: Fink Core Group <fink-core@lists.sourceforge.net>
Depends: base-files
BuildDepends: fink-prebinding
+AddShlibDeps: true
Conflicts: mktemp
Replaces: mktemp, tetex
Provides: mktemp
View
@@ -1,8 +1,9 @@
Package: dpkg-bootstrap
Version: 1.10.21
Revision: 200
-Depends: gettext, gzip, tar
-BuildDepends: gcc3.3
+Depends: gzip, tar
+BuildDepends: gcc3.3, gettext-dev
+AddShlibDeps: true
Maintainer: Fink Core Group <fink-core@lists.sourceforge.net>
Source: mirror:sourceforge:fink/dpkg_%v.tar.gz
SourceDirectory: dpkg-%v
View
@@ -2,8 +2,9 @@ Package: dpkg
Version: 1.10.21
Revision: 202
GCC: 3.3
-Depends: gettext, libiconv, gzip, tar, ncurses (>= 5.4-20041023-4)
-BuildDepends: gcc3.3, fink (>= 0.23.4-1)
+Depends: gzip, tar, ncurses (>= 5.4-20041023-4)
+BuildDepends: gcc3.3, fink (>= 0.23.4-1), gettext-dev, libiconv-dev, libncurses5
+AddShlibDeps: true
Essential: yes
Maintainer: Fink Core Group <fink-core@lists.sourceforge.net>
Source: mirror:sourceforge:fink/dpkg_%v.tar.gz
View
@@ -5,6 +5,7 @@ Essential: yes
Source: mirror:custom:fink/%n-%v.tar.gz
Source-MD5: f697bb021577813ac50ffec023629514
Depends: fink (>= 0.17.3-1)
+AddShlibDeps: true
Replaces: fink (<< 0.17.2-1)
CompileScript: sed -e "s|@PREFIX@|%p|" < postinstall.pl.in > postinstall.pl
InstallScript: ./install.sh %i
@@ -7,6 +7,7 @@ Source-MD5: 6ab0e97ca25dbe9359eb1e0e5b44e851
Essential: yes
BuildDepends: fink (>= 0.17.0-1)
Depends: base-files, fink (>= 0.17.0-1), cctools-extra (>= 1:495-1)
+AddShlibDeps: true
CompileScript: make PREFIX='%p' MANDIR='%p/share/man'
InstallScript: make PREFIX='%p' MANDIR='%p/share/man' DESTDIR='%d' install
Description: Tools for enabling prebinding in Fink
View
@@ -4,8 +4,9 @@ Revision: 18
Source: mirror:gnu:gettext/gettext-%v.tar.gz
Source-MD5: 6a17767b47ffb45b4866cec9fb0a39b0
Essential: yes
-Depends: libiconv, libiconv-bin, base-files
+Depends: libiconv-bin, base-files
BuildDepends: libiconv-dev, fink (>= 0.13.6), fink-prebinding
+AddShlibDeps: true
Shlibs: %p/lib/libintl.1.dylib 2.0.0 %n (>= 0.10.40-5)
DescPackaging: <<
Shared libraries are in gettext for backward compatibility, to avoid
@@ -28,6 +29,7 @@ DocFiles: README* AUTHORS BUGS COPYING* NEWS THANKS TODO
SplitOff: <<
Package: gettext-bin
Depends: %N (= %v-%r)
+ AddShlibDeps: true
Replaces: %N (<= 0.10.40-4)
Files: bin share/aclocal share/doc/gettext/*.html share/emacs share/gettext share/info share/locale share/man
Description: Executables for gettext package
@@ -37,6 +39,7 @@ SplitOff: <<
SplitOff2: <<
Package: gettext-dev
Depends: gettext (= %v-%r)
+ AddShlibDeps: true
Replaces: gettext (<= 0.10.40-4)
BuildDependsOnly: true
Files: include lib/libintl.dylib lib/*.a lib/*.la
View
@@ -5,6 +5,7 @@ Source: mirror:sourceforge:fink/%n-%v.tar.gz
Source-MD5: 39053e044b18ecd0627f80fbe7cfeaad
Essential: yes
Depends: base-files
+AddShlibDeps: true
Patch: %f.patch
PatchScript: mv -f INSTALL INSTALL.txt
CompileScript: <<
View
@@ -6,6 +6,7 @@ Source-MD5: 0c99a05e0c3c153bac1c960f78711155
Essential: yes
Depends: base-files
BuildDepends: fink (>= 0.13.0), fink-prebinding
+AddShlibDeps: true
Shlibs: <<
%p/lib/libcharset.1.dylib 2.0.0 %n (>= 1.7-7)
%p/lib/libiconv.2.dylib 5.0.0 %n (>= 1.9.1-1)
@@ -37,6 +38,7 @@ SplitOff: <<
Package: libiconv-bin
Essential: true
Depends: libiconv (= %v-%r)
+ AddShlibDeps: true
Replaces: libiconv (<= 1.7-6)
Files: bin share/doc/libiconv/*.html share/man
Description: Executables for libiconv package
@@ -45,6 +47,7 @@ SplitOff: <<
SplitOff2: <<
Package: libiconv-dev
Depends: libiconv (= %v-%r)
+ AddShlibDeps: true
Replaces: libiconv (<= 1.7-6)
BuildDependsOnly: true
Files: include lib/libcharset.dylib lib/libiconv.dylib lib/*.a lib/*.la
View
@@ -21,6 +21,7 @@ Replaces: ncurses (<= 5.3-1)
Depends: base-files
Essential: yes
BuildDepends: fink (>= 0.13.0)
+AddShlibDeps: true
ConfigureParams: --without-ada --without-debug --with-shared --with-debug --enable-termcap --mandir=%p/share/man --with-terminfo-dirs="%p/share/terminfo:/usr/share/terminfo" --with-default-terminfo-dir="%p/share/terminfo" --enable-no-padding --enable-sigwinch --enable-tcap-names --enable-hard-tabs
NoSetCFLAGS: true
NoSetLDFLAGS: true
@@ -57,6 +58,7 @@ SplitOff: <<
Depends: ncurses-shlibs (= %v-%r)
Replaces: ncurses (<= 5.3-1), libncurses5
Conflicts: libncurses5
+ AddShlibDeps: true
BuildDependsOnly: True
Files: include lib/libform.dylib lib/libmenu.dylib lib/libncurses.dylib lib/libpanel.dylib lib/*.a
Description: Development files for ncurses package
View
@@ -23,6 +23,7 @@ PatchScript: <<
BuildDepends: fink (>= 0.13.0), fink-prebinding
Depends: libncurses5-shlibs (>= %v-%r)
Replaces: libncurses5 (<< 5.4-20041023-4)
+AddShlibDeps: true
Essential: true
ConfigureParams: --without-ada --with-shared --with-debug --enable-termcap --mandir=%p/share/man --with-terminfo-dirs="%p/share/terminfo:/usr/share/terminfo" --with-default-terminfo-dir="%p/share/terminfo" --enable-no-padding --enable-sigwinch --enable-tcap-names --enable-hard-tabs --enable-overwrite
NoSetCFLAGS: true
@@ -50,6 +51,7 @@ InstallScript: <<
SplitOff: <<
Package: libncurses5-shlibs
Depends: base-files
+ AddShlibDeps: true
Essential: true
Files: <<
lib/ncurses/libform.*.dylib
@@ -72,6 +74,7 @@ SplitOff2: <<
BuildDependsOnly: true
Conflicts: ncurses-dev
Replaces: ncurses-dev, ncurses (<= 5.3-20031018-2)
+ AddShlibDeps: true
Files: lib/ncurses include lib/libcurses.dylib lib/libform.dylib lib/libmenu.dylib lib/libncurses.dylib lib/libpanel.dylib
DocFiles: README ANNOUNCE NEWS INSTALL TO-DO MANIFEST
Description: Full-screen ascii drawing library
View
@@ -3,6 +3,7 @@ Version: 1.0.14
Revision: 9
Type: bundle
Depends: storable-pm560 | storable-pm561 | perl580-core | perl581-core | perl582-core | perl584-core | perl586-core
+AddShlibDeps: true
Description: Placeholder for versioned Storable packages
DescPackaging: <<
This version of storable-pm can be installed when /usr/bin/perl is either
View
@@ -3,8 +3,9 @@ Version: 1.14
Revision: 1
Essential: yes
GCC: 3.3
-Depends: gettext, gzip, bzip2, base-files
+Depends: gzip, bzip2, base-files
BuildDepends: gettext-dev
+AddShlibDeps: true
Source: mirror:sourceforge:fink/%n-%v.tar.gz
Source-MD5: 3094544702b1affa32d969f0b6459663
UpdateConfigGuess: true
View
@@ -4,6 +4,7 @@ Revision: 14
Maintainer: Fink Core Group <fink-core@lists.sourceforge.net>
License: BSD
Essential: yes
+AddShlibDeps: true
#CustomMirror: <<
#nam-US: http://uiarchive.uiuc.edu/mirrors/ftp/ftp.info-zip.org/pub/infozip/src/
#nam-US: ftp://uiarchive.cso.uiuc.edu/pub/ftp/ftp.info-zip.org/pub/infozip/src/
View
@@ -0,0 +1,36 @@
+Breaks:
+* show-deps
+* buildlock
+
+ Both are based on the same function, and since Depends aren't fully known for
+ packages using AddShlibDeps till deb building phase.
+
+ The solution for buildlock is to enforce the policy that all -dev packages
+ must have a Depends (RunTimeDepends) on it's -shlibs.
+
+Missing:
+* remove comments and add debug code to pedantic verbosity
+* Common code for build, updating and reading the shlibs.db should get merged
+* Better checking/enforcing of the Shlibs field
+* Warning about Depends being removed in the future.
+* Check for depends on children packages
+ This should be easy enough by:
+ 1) installing all the files and adding a check for the files minus %i + %p
+ (installed name) and adding the contents to a hash with the package name in
+ it and adding it to the loop. This should be versioned to = for the most
+ part and not read from shlibs.
+ 2) just read the shlibs fields in the currently build pkgs (current info file)
+ and temporarily to the shlibs hash and looped. (won't be able to use = for
+ this version, but much easier to implement)
+
+Documentation:
+* AddShlibDeps:
+* RunTimeDepends:
+* new use of Depends and BuildDepends, where BuildDepends and Depends are
+ combined during build phase, and Depends and RunTimeDepends are combined for
+ the Dep. Depends should eventually be discontinued and unsupported and
+ should be added as a warning to the validator. This is to avoid breakage
+ while we get everything into BuildDepends for fink build, a pkg should build
+ without Depends at all. AssShlibDeps will auto add all Shared Library
+ depends to RunTimeDepends line and will be versioned via Shlibs fields from
+ all installed packages.
View
@@ -0,0 +1,3 @@
+/usr/lib/libSystem.B.dylib 1.0.0 darwin (>= 1.0-1)
+/usr/lib/libssl.0.9.7.dylib 0.9.7 darwin (>= 7.0-1)
+/usr/lib/libcrypto.0.9.7.dylib 0.9.7 darwin (>= 7.0-1)
View
@@ -58,6 +58,7 @@ install -c -p -m 755 fink-virtual-pkgs "$basepath/bin/"
install -c -p -m 755 pathsetup.sh "$basepath/bin/"
install -c -p -m 644 fink.8 "$basepath/share/man/man8/"
install -c -p -m 644 fink.conf.5 "$basepath/share/man/man5/"
+install -c -p -m 644 fink.shlibs "$basepath/../DEBIAN/shlibs"
install -c -p -m 644 images/*.png "$basepath/share/fink/images/"
# copy all perl modules
@@ -494,7 +494,7 @@ sub fink_packagefiles {
my $packagefiles = "COPYING INSTALL INSTALL.html README README.html USAGE USAGE.html Makefile ".
"ChangeLog VERSION REVISION fink.in fink.8.in fink.conf.5.in images install.sh setup.sh ".
"shlibs.default.in pathsetup.sh.in postinstall.pl.in perlmod update t ".
- "fink-virtual-pkgs.in";
+ "fink-virtual-pkgs.in fink.shlibs";
return $packagefiles;
Oops, something went wrong.

0 comments on commit 28b27e8

Please sign in to comment.