Skip to content

Commit

Permalink
fix order and add patchelf deps for slc7
Browse files Browse the repository at this point in the history
  • Loading branch information
smuzaffar committed Mar 19, 2023
1 parent 2cb2cb9 commit 7972458
Show file tree
Hide file tree
Showing 5 changed files with 34 additions and 7 deletions.
8 changes: 8 additions & 0 deletions jemalloc-common.file
Expand Up @@ -5,6 +5,14 @@
Source: git+https://github.com/%{github_user}/jemalloc.git?obj=%{branch}/%{tag}&export=%{n}-%{realversion}&output=/%{n}-%{realversion}-%{tag}.tgz
BuildRequires: autotools gmake

%if "%{n}" != "jemalloc"
%ifarch x86_64
%if "%{rhel}" == "7"
BuildRequires: patchelf
%endif
%endif
%endif

%prep

%{?PrePrep:%PrePrep}
Expand Down
2 changes: 1 addition & 1 deletion jemalloc-debug.spec
@@ -1,3 +1,3 @@
%define autogen_opts --enable-debug --enable-fill
## INCLUDE jemalloc-common
### RPM external jemalloc-debug %{jemalloc_version}
%define autogen_opts --enable-debug --enable-fill
8 changes: 3 additions & 5 deletions jemalloc-prof.spec
@@ -1,10 +1,8 @@
# any "Requires" must come before "## INCLUDE jemalloc-common"
# to make sure they are declared before the "%prep" section defined there
Requires: libunwind
## INCLUDE jemalloc-common
### RPM external jemalloc-prof %{jemalloc_version}
%define autogen_opts --enable-prof --enable-prof-libunwind
%define PreBuild \
export CXXFLAGS=-I$LIBUNWIND_ROOT/include \
export CFLAGS=-I$LIBUNWIND_ROOT/include \
export LDFLAGS=-L$LIBUNWIND_ROOT/lib
Requires: libunwind
## INCLUDE jemalloc-common
### RPM external jemalloc-prof %{jemalloc_version}
2 changes: 1 addition & 1 deletion jemalloc.spec
@@ -1,3 +1,3 @@
%define autogen_opts %{nil}
## INCLUDE jemalloc-common
### RPM external jemalloc %{jemalloc_version}
%define autogen_opts %{nil}
21 changes: 21 additions & 0 deletions patchelf.spec
@@ -0,0 +1,21 @@
### RPM external patchelf 0.13
## NO_AUTO_RUNPATH

%define git_branch master
%define git_commit %{realversion}
Source0: git://github.com/NixOS/patchelf.git?obj=%{git_branch}/%{git_commit}&export=patchelf-%{realversion}&output=/patchelf-%{realversion}.tgz
BuildRequires: autotools gmake

%define drop_files %{i}/share

%prep
%setup -n patchelf-%{realversion}

%build

./bootstrap.sh
./configure --prefix=%{i}
make %{makeprocesses}

%install
make install

0 comments on commit 7972458

Please sign in to comment.