The scaffolding to support architectures without shared libraries
has been removed from the ports infrastructure. This updates the
ports tree man pages accordingly.
bsd.port.arch.mk.5
bsd.port.mk.5
port-modules.5
ruby-module.5
Gone are or will be shortly:
* the variables CONFIGURE_SHARED, NO_SHARED_LIBS, NO_SHARED_ARCHS,
and SHARED_ONLY;
* the PROPERTIES value "no_shared";
* the PFRAG.shared* and PFRAG.no-shared* files.
(While there, also drop mention of the long gone PROPERTIES value
"elf".)
OK?
Index: bsd.port.arch.mk.5
===================================================================
RCS file: /cvs/src/share/man/man5/bsd.port.arch.mk.5,v
retrieving revision 1.8
diff -u -p -r1.8 bsd.port.arch.mk.5
--- bsd.port.arch.mk.5 10 Aug 2013 10:17:36 -0000 1.8
+++ bsd.port.arch.mk.5 21 Mar 2016 22:02:36 -0000
@@ -72,7 +72,6 @@ assumes the following variables are alre
.El
and optionally, if the default won't be appropriate
.Bl -tag -offset indent -compact -width ONLY_FOR_ARCH-<sub>
-.It Ev NO_SHARED_LIBS
.It Ev IGNORE[-<sub>]
.El
.Pp
@@ -88,8 +87,6 @@ It will set up the following variables f
.It Ev GCC4_ARCHS
.It Ev LE_ARCHS
.It Ev LP64_ARCHS
-.It Ev NO_SHARED_ARCHS
-.It Ev NO_SHARED_LIBS
.It Ev PROPERTIES
.It Ev IGNORE-<sub>
.It Ev BUILD_PACKAGES
@@ -133,19 +130,13 @@ A more detailed description of each vari
.Pp
All the constant values
.Ev ARCH , ALL_ARCHS , COMPILER_VERION ,
-.Ev GCC3_ARCHS , GCC4_ARCHS , LP64_ARCHS , NO_SHARED_ARCHS
+.Ev GCC3_ARCHS , GCC4_ARCHS , LP64_ARCHS
and
.Ev PROPERTIES
are also available from
.Ev MODULES
and from
.Pa ${.CURDIR}/../Makefile.inc .
-Note that due to historical accident,
-.Ev NO_SHARED_LIBS
-is not such a constant.
-Test
-.Ev PROPERTIES
-to assert whether a given platform supports shared libraries.
.Sh SEE ALSO
.Xr bsd.port.mk 5
.Sh HISTORY
Index: bsd.port.mk.5
===================================================================
RCS file: /cvs/src/share/man/man5/bsd.port.mk.5,v
retrieving revision 1.433
diff -u -p -r1.433 bsd.port.mk.5
--- bsd.port.mk.5 11 Mar 2016 20:40:23 -0000 1.433
+++ bsd.port.mk.5 21 Mar 2016 22:02:37 -0000
@@ -834,20 +834,14 @@ as well.
Update the packing lists for a port, using the fake installation and the
existing packing lists.
.Cm update-plist
-should produce mostly correct
-.Pa PLIST ,
-.Pa PFRAG.shared
-and
-.Pa PFRAG.no-shared
-files, handling shared libraries, GNU
+should produce a mostly correct
+.Pa PLIST
+file, handling GNU
.Xr info 1
files, setuid files, and empty directories.
-It moves existing files to
-.Pa PLIST.orig ,
-.Pa PFRAG.shared.orig
-and
-.Pa PFRAG.no-shared.orig .
-If the generated lists include files and directories that shouldn't be
+It moves an existing file to
+.Pa PLIST.orig .
+If the generated list includes files and directories that shouldn't be
included, comment these like this:
.Bd -literal
@comment unwanted-file
@@ -1311,11 +1305,6 @@ Set to name of script invoked by the
.Cm configure
target, if appropriate.
Should be either an absolute path, or relative to ${WRKSRC}.
-.It Ev CONFIGURE_SHARED
-Set by default to --enable-shared or --disable-shared, depending on whether
-the architecture supports shared libraries.
-Should be appended to CONFIGURE_ARGS, for ports that build dynamic libraries
-and whose configure script supports these options.
.It Ev CONFIGURE_STYLE
Set to style of configuration that needs to happen.
.Pp
@@ -2035,11 +2024,6 @@ ${PACKAGE_REPOSITORY}/${NO_ARCH}.
List of architectures on which this port does not build.
See also
.Ev ONLY_FOR_ARCHS .
-See also
-.Ev SHARED_ONLY .
-Do not use instead of
-.Ev SHARED_ONLY
-without very good reasons.
.It Ev NO_BUILD
Set to
.Sq Yes
@@ -2090,20 +2074,6 @@ It should be left alone for ports with e
ports with failing tests.
That way, if a subsequent update of a port acquires actual regression tests,
they will be picked up automatically.
-.It Ev NO_SHARED_ARCHS
-Set to the list of platforms that do not support shared libraries.
-Read-only.
-Use with
-.Ev NOT_FOR_ARCHS .
-.It Ev NO_SHARED_LIBS
-Set to
-.Sq Yes
-if platform does not support shared libraries.
-To be tested after including
-.Nm ,
-or
-.Xr bsd.port.arch.mk 5 ,
-if neither PFRAG.shared nor CONFIGURE_SHARED are enough.
.It Ev NO_SYSTRACE
Port does not build with systrace-enabled build targets.
.It Ev OLD_WRKDIR_NAME
@@ -2493,22 +2463,17 @@ and
.Ev BUILD_PACKAGES
is generally preferred (and simpler).
Possible properties include
-.Bl -tag -width no_shared
+.Bl -tag -width mono
.It apm
architecture possesses suspend (apm) support.
.It be
architecture is big-endian.
.It gccN
gccN architecture.
-.It elf
-.Xr elf 5
-architecture.
.It le
architecture is little-endian.
.It lp64
lp64 architecture.
-.It no_shared
-architecture has no shared library support.
.It llvm
there is
.Pa lang/llvm
@@ -2667,10 +2632,6 @@ Porters of software using libtool should
.Ev MAKE_FLAGS
get propagated to the libtool invocations.
This should be enough in most cases.
-.It Ev SHARED_ONLY
-Set to
-.Sq Yes
-if port can only be built on architectures with shared libraries.
.It Ev SIGNING_PARAMETERS
User settings.
Set to
@@ -3671,7 +3632,7 @@ e.g., if FLAVORS=no_map gfx qt2, if FLAV
.Sq -no_map-gfx .
.It
Generate the actual PLIST from the template ${PLIST},
-by inserting shared/no-shared fragments, merging other fragments,
+by inserting fragments
and applying the same variable substitutions as other package information.
.El
.Pp
@@ -3682,30 +3643,20 @@ generation.
To avoid substitution, variables can be escaped as follows:
.Li "$\e{PREFIX}"
.Pp
-Constructs such as the line
-.Li "%%SHARED%%"
+If FLAVORS lists flv, then constructs such as the line
+.Li "%%flv%%"
or
-.Li "!%%SHARED%%"
-in the packing-list template trigger the inclusion of the
-.Pa ${PKGDIR}/PFRAG.shared${SUBPACKAGE}
+.Li "!%%flv%%"
+in the packing-list template trigger the inclusion of
+.Pa ${PKGDIR}/PFRAG.flv${SUBPACKAGE}
or
-.Pa ${PKGDIR}/PFRAG.no-shared${SUBPACKAGE} .
-.Pp
-Similarly, if FLAVORS lists flav1, then the line
-.Li "%%flav1%%"
-(resp.
-.Li "!%%flav1%%" )
-will trigger the inclusion of
-.Pa ${PKGDIR}/PFRAG.flav1${SUBPACKAGE}
-(resp.
-.Pa ${PKGDIR}/PFRAG.no-flav1${SUBPACKAGE} )
-in the packing-list.
+.Pa ${PKGDIR}/PFRAG.no-flv${SUBPACKAGE}.
Other fragments can be defined by simply adding
.Li "-Dfrag=1"
or
.Li "-Dfrag=0"
to
-.Ev PKG_ARGS
+.Ev PKG_ARGS .
.Pp
If libraries are built using
.Pa bsd.lib.mk ,
@@ -3741,8 +3692,7 @@ Some programs will prefer to use rpath t
.Pp
The special
.Cm update-plist
-target does a fairly good job of automatically generating PLIST and
-PFRAG.shared fragments.
+target does a fairly good job of automatically generating PLIST.
.Pp
If
.Ev PLIST_DB
@@ -3848,6 +3798,9 @@ Now hardwired to
Used to be the name of the comment file for a package.
It now holds the comment itself.
Some magic has been put in to allow for a seamless transition.
+.It Ev CONFIGURE_SHARED
+Used to default to --enable-shared or --disable-shared, depending on whether
+the architecture supported shared libraries.
.It Ev DESCR_SRC
From
.Nx .
@@ -3967,6 +3920,13 @@ All ports should generate a package, pre
.It Ev NO_PATCH
The absence of a patches directory does the same.
Use PATCHDIR and PATCH_LIST if patches need to be changed dynamically.
+.It Ev NO_SHARED_ARCHS
+Used to be set to the list of platforms that did not support shared libraries.
+No such architectures remain.
+.It Ev NO_SHARED_LIBS
+Used to be set to
+.Sq Yes
+if platform did not support shared libraries.
.It Ev NO_WRKDIR
All ports should have a working directory, as this is necessary to store
cookies and keep state.
@@ -4035,7 +3995,7 @@ Concentrate on real questions instead, m
.Ev PERMIT_PACKAGE_CDROM
is set correctly.
.It Ev PKG_CMD
-replaced by
+Replaced by
.Ev PKG_CREATE .
.It Ev PKGREPOSITORY
Old user settings.
@@ -4093,6 +4053,10 @@ Used to contain the environment for invo
and
.Ev MAKE_ENV
are enough.
+.It Ev SHARED_ONLY
+Had to be set to
+.Sq Yes
+if port could only be built on architectures with shared libraries.
.It Ev USE_AUTOCONF
Use
.Ev CONFIGURE_STYLE
@@ -4159,9 +4123,9 @@ Use COMMENT variable instead.
Use @unexec annotations in the packing-list instead.
.It Pa ${PKGDIR}/INSTALL*
Use @exec annotations in the packing-list instead.
-.It Pa ${PKGDIR}/PLIST.noshared
-Use PFRAG.shared or PFRAG.no-shared instead.
-PLIST.noshared was too easy to forget when updating ports.
+.It Pa ${PKGDIR}/PLIST.{noshared,no-shared,shared}
+Packaging list fragments to handle platforms that did not support
+shared libraries.
.It Pa ${PKGDIR}/PLIST.sed
Use PLIST directly.
Until revision 1.295,
Index: port-modules.5
===================================================================
RCS file: /cvs/src/share/man/man5/port-modules.5,v
retrieving revision 1.200
diff -u -p -r1.200 port-modules.5
--- port-modules.5 19 Feb 2016 09:15:32 -0000 1.200
+++ port-modules.5 21 Mar 2016 22:02:37 -0000
@@ -283,7 +283,6 @@ The following variables can be overridde
.Ev TEST_IS_INTERACTIVE ,
.Ev REORDER_DEPENDENCIES ,
.Ev SEPARATE_BUILD ,
-.Ev SHARED_ONLY ,
.Ev USE_GMAKE ,
.Ev USE_LIBTOOL .
.Pp
@@ -363,12 +362,12 @@ value:
.Ev PKGPATH ,
.Ev PORTSDIR ,
.Ev X11BASE
-and all arch-dependent constant from
+and all arch-dependent constants from
.Xr bsd.port.arch.mk 5 ,
such as
.Ev PROPERTIES
or
-.Ev NO_SHARED_ARCHS .
+.Ev LP64_ARCHS .
Note that this is only relevant for tests.
It is perfectly okay to define variables or targets that depend on the
basic ports framework without having to care whether that variable is
@@ -1151,7 +1150,6 @@ Also affects
.Ev CATEGORIES ,
.Ev MAKE_ENV ,
.Ev CONFIGURE_ENV ,
-.Ev SHARED_ONLY ,
and
.Ev SUBST_VARS .
May affect the
@@ -1311,9 +1309,8 @@ Sets
.Ev MASTER_SITES ,
.Ev DISTNAME ,
.Ev USE_GMAKE ,
-.Ev ONLY_FOR_ARCHS
and
-.Ev SHARED_ONLY .
+.Ev ONLY_FOR_ARCHS .
.Ev EXTRACT_SUFX
defaults to .tar.bz2.
.Pp
@@ -1433,9 +1430,6 @@ is set to "Yes".
If
.Ev CONFIGURE_STYLE
is set to "gnu" or "simple",
-.Ev CONFIGURE_SHARED
-is appended to
-.Ev CONFIGURE_ARGS ,
.Li CPPFLAGS="-I${LOCALBASE}/include"
and
.Li LDFLAGS="-L${LOCALBASE}/lib"
@@ -1744,9 +1738,8 @@ set by a port:
.Ev EXTRACT_SUFX ,
.Ev ONLY_FOR_ARCHS ,
.Ev PORTHOME ,
-.Ev SEPARATE_BUILD
and
-.Ev SHARED_ONLY .
+.Ev SEPARATE_BUILD .
.Pp
The x11/kde4 module modifies the following variables if needed:
.Ev BUILD_DEPENDS ,
Index: ruby-module.5
===================================================================
RCS file: /cvs/src/share/man/man5/ruby-module.5,v
retrieving revision 1.18
diff -u -p -r1.18 ruby-module.5
--- ruby-module.5 7 Jan 2016 22:21:19 -0000 1.18
+++ ruby-module.5 21 Mar 2016 22:02:37 -0000
@@ -160,8 +160,6 @@ The "ruby gem ext"
.Ev CONFIGURE_STYLE
should be used for ruby gems with C extensions.
This adds
-.Ev SHARED_ONLY Ns =Yes
-and adds
.Ev MODRUBY_LIB_DEPENDS
to
.Ev LIB_DEPENDS
--
Christian "naddy" Weisgerber na...@mips.inka.de
