#49906 Ticket 48377 - Only ship libjemalloc.so.2
Closed 2 years ago by spichugi. Opened 3 years ago by mreynolds.
mreynolds/389-ds-base ticket48377  into  master

file modified
+8 -5
@@ -4,7 +4,7 @@ 

  %global bundle_jemalloc __BUNDLE_JEMALLOC__

  %if %{bundle_jemalloc}

  %global jemalloc_name jemalloc

- %global jemalloc_ver 5.0.1

+ %global jemalloc_ver 5.1.0

  %endif

  

  # This is used in certain builds to help us know if it has extra features.
@@ -688,6 +688,12 @@ 

  %if %{bundle_jemalloc}

  %{_libdir}/%{pkgname}/lib/

  %{_libdir}/%{pkgname}/bin/

+ %exclude %{_libdir}/%{pkgname}/bin/jemalloc-config

+ %exclude %{_libdir}/%{pkgname}/bin/jemalloc.sh

+ %exclude %{_libdir}/%{pkgname}/lib/libjemalloc.a

+ %exclude %{_libdir}/%{pkgname}/lib/libjemalloc.so

+ %exclude %{_libdir}/%{pkgname}/lib/libjemalloc_pic.a

+ %exclude %{_libdir}/%{pkgname}/lib/pkgconfig

  %endif

  

  %files devel
@@ -702,9 +708,6 @@ 

  %{_libdir}/%{pkgname}/libnunc-stans.so

  %{_libdir}/%{pkgname}/libsds.so

  %{_libdir}/%{pkgname}/libldaputil.so

- %if %{bundle_jemalloc}

- %{_libdir}/%{pkgname}/lib/libjemalloc.so

- %endif

  %{_libdir}/pkgconfig/svrcore.pc

  %{_libdir}/pkgconfig/dirsrv.pc

  %{_libdir}/pkgconfig/libsds.pc
@@ -721,7 +724,7 @@ 

  %{_libdir}/%{pkgname}/libsds.so.*

  %{_libdir}/%{pkgname}/libldaputil.so.*

  %if %{bundle_jemalloc}

- %{_libdir}/%{pkgname}/lib/libjemalloc.so.*

+ %{_libdir}/%{pkgname}/lib/libjemalloc.so.2

  %endif

  %if %{use_rust}

  %{_libdir}/%{pkgname}/librsds.so

Description: We are only supposed to ship libjemalloc.so.2, and nothing else.

https://pagure.io/389-ds-base/issue/48377

Reviewed by: ?

I don't see any issues here, but @vashirov has been pretty good with the rpm specfiles lately so maybe he has some input.

With this change 389-ds-base-devel no longer requires jemalloc and doesn't ship jemalloc.so. So LGTM. But since you're changing spec file around jemalloc, could you please also bump jemalloc version, so it's the same in Fedora and upstream spec files?

rebased onto 11d689d

3 years ago

Pull-Request has been merged by mreynolds

3 years ago

With this change 389-ds-base-devel no longer requires jemalloc and doesn't ship jemalloc.so. So LGTM. But since you're changing spec file around jemalloc, could you please also bump jemalloc version, so it's the same in Fedora and upstream spec files?

Done!

389-ds-base is moving from Pagure to Github. This means that new issues and pull requests
will be accepted only in 389-ds-base's github repository.

This pull request has been cloned to Github as issue and is available here:
- https://github.com/389ds/389-ds-base/issues/2965

If you want to continue to work on the PR, please navigate to the github issue,
download the patch from the attachments and file a new pull request.

Thank you for understanding. We apologize for all inconvenience.

Pull-Request has been closed by spichugi

2 years ago
Metadata