diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2013-12-07 23:04:18 +0100 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2013-12-07 23:04:18 +0100 |
| commit | 51afd69b23ad2b39403c39720ae519639371b67e (patch) | |
| tree | cae7e8d71ee167b7eee42b62d750330785fa6fee | |
| parent | 1ac043b9402b96d6dd58d15a5b17a6039c97ac45 (diff) | |
| download | nx-libs-51afd69b23ad2b39403c39720ae519639371b67e.tar.gz nx-libs-51afd69b23ad2b39403c39720ae519639371b67e.tar.bz2 nx-libs-51afd69b23ad2b39403c39720ae519639371b67e.zip | |
The RPM macro for the linker flags does not exist on EPEL. Thus, hardcode __global_ldflags macro for EPEL builds.
| -rw-r--r-- | debian/changelog | 2 | ||||
| -rw-r--r-- | nx-libs.spec | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog index 55c7287fb..0f04f8e86 100644 --- a/debian/changelog +++ b/debian/changelog @@ -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 already. + 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 ] * Add patch 605_nxcomp_Types.h-dont-use-STL-internals-on-libc++.full.patch. Fix diff --git a/nx-libs.spec b/nx-libs.spec index 07e2ba5c9..fe68896ca 100644 --- a/nx-libs.spec +++ b/nx-libs.spec @@ -527,6 +527,8 @@ cat >"my_configure" <<'EOF' %configure EOF 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}" make %{?_smp_mflags} CONFIGURE="$PWD/my_configure" USRLIBDIR=%{_libdir}/nx SHLIBDIR=%{_libdir}/nx |