Skip to content

N
nx-libs
Commit 51afd69b authored by Mike Gabriel's avatar Mike Gabriel
Browse files
Options

The RPM macro for the linker flags does not exist on EPEL. Thus, hardcode…

The RPM macro for the linker flags does not exist on EPEL. Thus, hardcode __global_ldflags macro for EPEL builds.
parent 1ac043b9
Show whitespace changes
Inline Side-by-side
Showing with 4 additions and 0 deletions
debian/changelog
View file @ 51afd69b
...@@ -27,6 +27,8 @@ nx-libs (2:3.5.0.22-0x2go1) UNRELEASED; urgency=low ...@@ -27,6 +27,8 @@ nx-libs (2:3.5.0.22-0x2go1) UNRELEASED; urgency=low
to the Fedora package maintainers). File differs from the Fedora file to the Fedora package maintainers). File differs from the Fedora file
already. already.
+ Use local tarball, don't expect ,,-full'' in tarball name. + Use local tarball, don't expect ,,-full'' in tarball name.
+ The RPM macro for the linker flags does not exist on EPEL. Thus, hardcode
__global_ldflags macro for EPEL builds.
[ Clemens Lang ] [ Clemens Lang ]
* Add patch 605_nxcomp_Types.h-dont-use-STL-internals-on-libc++.full.patch. Fix * Add patch 605_nxcomp_Types.h-dont-use-STL-internals-on-libc++.full.patch. Fix
......
nx-libs.spec
View file @ 51afd69b
...@@ -527,6 +527,8 @@ cat >"my_configure" <<'EOF' ...@@ -527,6 +527,8 @@ cat >"my_configure" <<'EOF'
%configure %configure
EOF EOF
chmod a+x my_configure; chmod a+x my_configure;
# The RPM macro for the linker flags does not exist on EPEL
%{!?__global_ldflags: %global __global_ldflags -Wl,-z,relro}
export SHLIBGLOBALSFLAGS="%{__global_ldflags}" export SHLIBGLOBALSFLAGS="%{__global_ldflags}"
make %{?_smp_mflags} CONFIGURE="$PWD/my_configure" USRLIBDIR=%{_libdir}/nx SHLIBDIR=%{_libdir}/nx make %{?_smp_mflags} CONFIGURE="$PWD/my_configure" USRLIBDIR=%{_libdir}/nx SHLIBDIR=%{_libdir}/nx
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment