Page MenuHomeFreeBSD
Differential D10428

libstdc++: fix up symbol version script
ClosedPublic
Actions

Authored by emaste on Apr 19 2017, 5:26 PM.
Tags
None
Referenced Files
Unknown Object (File)
Mar 15 2025, 3:52 PM
Unknown Object (File)
Mar 11 2025, 3:00 AM
Unknown Object (File)
Feb 18 2025, 4:55 AM
Unknown Object (File)
Feb 11 2025, 8:37 PM
Unknown Object (File)
Jan 9 2025, 11:29 AM
Unknown Object (File)
Dec 20 2024, 4:22 AM
Unknown Object (File)
Dec 15 2024, 9:50 AM
Unknown Object (File)
Nov 22 2024, 4:44 AM
View All 51 Files
Subscribers
bdrewery

Details

Reviewers
kan
marius
dim
pfg
theraven
bdrewery
Commits
rS317159: libstdc++: fix symbol version script for LLD
Summary

LLD is less tolerant of inconsistencies in the symbol version script.

  • Add a ; on the last entry in a version block
  • Remove duplicated symbols, retaining those in the earliest block

Diff Detail

Lint
Lint Skipped
Unit
Tests Skipped

Event Timeline

emaste created this revision.Apr 19 2017, 5:26 PM
emaste added a subscriber: bdrewery.Apr 19 2017, 5:39 PM

@bdrewery confirmed in D10352 that GNU ld puts symbols into the first version in which they're found.

bdrewery accepted this revision.Apr 19 2017, 5:49 PM
This revision is now accepted and ready to land.Apr 19 2017, 5:49 PM
Closed by commit rS317159: libstdc++: fix symbol version script for LLD (authored by emaste). · Explain WhyApr 19 2017, 7:07 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathSize
contrib/
libstdc++/
config/
abi/
pre/
32 lines

Diff 27553

View Options

contrib/libstdc++/config/abi/pre/gnu.ver

# Created by: Gerhard Häring <gh@ghaering.de> # Created by: Gerhard Häring <gh@ghaering.de>
# $FreeBSD$ # $FreeBSD$
PORTNAME= rdiff-backup PORTNAME= rdiff-backup
PORTVERSION= 1.2.8 DISTVERSION= 2.0.0
PORTREVISION= 3
PORTEPOCH= 1 PORTEPOCH= 1
CATEGORIES= sysutils CATEGORIES= sysutils python
koobsUnsubmitted
Done
Inline Actions

Add 'python' to CATEGORIES as a virtual category (particularly for those packages listed in PyPI)

koobs: Add 'python' to CATEGORIES as a virtual category (particularly for those packages listed in…
MASTER_SITES= SAVANNAH \ MASTER_SITES= CHEESESHOP
LOCAL/vd/${PORTNAME}${PKGNAMESUFFIX} PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= uzsolt@uzsolt.hu MAINTAINER= uzsolt@uzsolt.hu
COMMENT= Local/remote mirroring+incremental backup COMMENT= Easy to use and efficient backup and restore utility
koobsUnsubmitted
Not Done
Inline Actions

Set COMMENT to match setup.py:description (modulo portlint/length rules) where possible:

in rdiff-backups case: Backup and Restore utility, easy to use, efficient, locally and remotely usable

koobs: Set COMMENT to match setup.py:description (modulo portlint/length rules) where possible: in…
tagattieAuthorUnsubmitted
Done
Inline Actions

Will change the comments as follows. This is a bit different from what is is the description to not exceed 70 characters limit.

COMMENT=	Easy to use and efficient backup and restore utility
tagattie: Will change the comments as follows. This is a bit different from what is is the description to…
LICENSE= GPLv2 LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING
koobsUnsubmitted
Not Done
Inline Actions
  • License stipulated upstream is license="GPLv2+",
  • Add LICENSE_FILE where one is provided with the distribution files. Using github, the file is COPYING. It's also contained in the CHEESESHOP (PyPI) sdist as the same filename
koobs: * License stipulated upstream is license="GPLv2+", * Add LICENSE_FILE where one is provided…
tagattieAuthorUnsubmitted
Done
Inline Actions

Will change the license block as follows:

LICENSE=	GPLv2+
LICENSE_FILE=	${WRKSRC}/COPYING
tagattie: Will change the license block as follows: ``` LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/COPYING…
DEPRECATED= Uses deprecated version of python BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools_scm>0:devel/py-setuptools_scm@${PY_FLAVOR}
EXPIRATION_DATE= 2020-09-15
LIB_DEPENDS= librsync.so:net/librsync LIB_DEPENDS= librsync.so:net/librsync
TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}tox>0:devel/py-tox@${PY_FLAVOR}
koobsUnsubmitted
Not Done
Inline Actions

These don't appear to be declared dependencies. Where did they come from?

The only setup_requires I see listed for 2.0.0 is setuptools_scm [1]

[1] setup.py: setup_requires=['setuptools_scm'],

koobs: These don't appear to be declared dependencies. Where did they come from? The only…
tagattieAuthorUnsubmitted
Done
Inline Actions

Will delete those two dependencies and add setuptools_scm to BUILD_DEPENDS.

BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools_scm>0:devel/py-setuptools_scm@${PY_FLAVOR}
tagattie: Will delete those two dependencies and add `setuptools_scm` to `BUILD_DEPENDS`. ```…
USES= localbase:ldflags python:3.5+
USE_LDCONFIG= yes
koobsUnsubmitted
Not Done
Inline Actions

Use CHEESESHOP (PyPI) for MASTER_SITES unless there is a compelling reason not to

[1] https://wiki.freebsd.org/Python/PortsPolicy#MASTER_SITES

koobs: Use CHEESESHOP (PyPI) for MASTER_SITES unless there is a compelling reason not to [1] https…
tagattieAuthorUnsubmitted
Done
Inline Actions

Will switch from GITHUB to CHEESESHOP.
Delete:

USE_GITHUB=	yes

Add:

MASTER_SITES=	CHEESESHOP
tagattie: Will switch from GITHUB to CHEESESHOP. Delete: ``` USE_GITHUB= yes ``` Add: ```…
USE_PYTHON= autoplist concurrent distutils
koobsUnsubmitted
Not Done
Inline Actions

Use autoplist unless there's a compelling case note to.

Note also: autoplist can be complemented by a pkg-plist for manual entries

This package appears to install files into common (not python version specific) locations (like /usr/local/bin/) and as such must be made concurrent safe:

https://wiki.freebsd.org/Python/PortsPolicy#concurrent

koobs: Use autoplist unless there's a compelling case note to. Note also: autoplist can be…
tagattieAuthorUnsubmitted
Done
Inline Actions

Will change USE_PYTHON as follows:

USE_PYTHON=	autoplist concurrent distutils
tagattie: Will change `USE_PYTHON` as follows: ``` USE_PYTHON= autoplist concurrent distutils ```
CONFLICTS= rdiff-backup-devel-[0-9]* rdiff-backup-1.0* CONFLICTS= rdiff-backup-devel-[0-9]* rdiff-backup-1.0*
koobsUnsubmitted
Not Done
Inline Actions

The other ports mentioned here probably need to be leveled up in the same manner this one does

koobs: The other ports mentioned here probably need to be leveled up in the same manner this one does
tagattieAuthorUnsubmitted
Done
Inline Actions

There is no port named rdiff-backup-devel and this line seems some leftover from the past.

So I guess this line can be removed.

tagattie: There is no port named `rdiff-backup-devel` and this line seems some leftover from the past.
koobsUnsubmitted
Not Done
Inline Actions

This can be removed yeh?

koobs: This can be removed yeh?
tagattieAuthorUnsubmitted
Done
Inline Actions

It seems I was wrong. Those ports may be installed on a machine and may conflict with the current version.
So I would leave the line as it is.

tagattie: It seems I was wrong. Those ports may be installed on a machine and may conflict with the…
PORTSCOUT= limitw:1,even PORTSCOUT= limitw:1,even
USES= python:2.7
USE_PYTHON= distutils
USE_LDCONFIG= yes
MAN1S= rdiff-backup.1 rdiff-backup-statistics.1
DOCS= CHANGELOG README COPYING FAQ.html
OPTIONS_DEFINE= DOCS
post-install: post-install:
koobsUnsubmitted
Not Done
Inline Actions

Likely handled already (not needed) with USE_PYTHON=autoplist, if not leave them here or add them to pkg-plist

koobs: Likely handled already (not needed) with USE_PYTHON=autoplist, if not leave them here or add…
tagattieAuthorUnsubmitted
Done
Inline Actions

Will delete those 2 lines and let USE_PYTHON=autoplist handle those files.

tagattie: Will delete those 2 lines and let `USE_PYTHON=autoplist` handle those files.
${INSTALL_MAN} ${MAN1S:S,^,${WRKSRC}/,} ${STAGEDIR}${PREFIX}/man/man1 ${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/rdiff_backup/_librsync.so
@${MKDIR} ${STAGEDIR}${DOCSDIR} ${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/rdiff_backup/C.so
${INSTALL_DATA} ${DOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}
.for lib in C.so _librsync.so do-test:
${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/${PORTNAME:S,-,_,}/${lib} cd ${TEST_WRKSRC} && ${SETENV} ${TEST_ENV} ${PYTHON_CMD} -m tox
.endfor
koobsUnsubmitted
Done
Inline Actions

Use prefix-safe PYTHONPREFIX_SITELIBDIR variable here

koobs: Use prefix-safe PYTHONPREFIX_SITELIBDIR variable here
.include <bsd.port.mk> .include <bsd.port.mk>