Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
L
libzmq
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Packages
Packages
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
submodule
libzmq
Commits
5dd43350
Commit
5dd43350
authored
Sep 11, 2019
by
Luca Boccassi
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Problem: packages are not build with nss
Solution: add relevant dependencies
parent
9acdafb0
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
23 additions
and
2 deletions
+23
-2
control
packaging/debian/control
+2
-0
rules
packaging/debian/rules
+1
-1
zeromq.dsc.obs
packaging/debian/zeromq.dsc.obs
+1
-1
zeromq.spec
packaging/redhat/zeromq.spec
+19
-0
No files found.
packaging/debian/control
View file @
5dd43350
...
...
@@ -9,6 +9,7 @@ Build-Depends: debhelper (>= 9),
libpgm-dev,
libsodium-dev,
libunwind-dev | libunwind8-dev | libunwind7-dev,
libnss3-dev,
pkg-config,
asciidoc-base | asciidoc, xmlto,
Standards-Version: 3.9.8
...
...
@@ -38,6 +39,7 @@ Depends: libzmq5 (= ${binary:Version}), ${misc:Depends},
libpgm-dev,
libsodium-dev,
libunwind-dev | libunwind8-dev | libunwind7-dev,
libnss3-dev,
Conflicts: libzmq-dev, libzmq5-dev
Replaces: libzmq5-dev
Provides: libzmq5-dev
...
...
packaging/debian/rules
View file @
5dd43350
...
...
@@ -43,7 +43,7 @@ override_dh_clean:
rm
-f
config.log
override_dh_auto_configure
:
dh_auto_configure
--
--with-pgm
--with-libsodium
--enable-drafts
=
$(DRAFTS)
--with-libgssapi_krb5
=
yes
--with-norm
=
yes
dh_auto_configure
--
--with-pgm
--with-libsodium
--enable-drafts
=
$(DRAFTS)
--with-libgssapi_krb5
=
yes
--with-norm
=
yes
--with-nss
=
yes
override_dh_auto_test
:
ifeq
(,$(filter
nocheck,$(DEB_BUILD_OPTIONS)))
...
...
packaging/debian/zeromq.dsc.obs
View file @
5dd43350
...
...
@@ -6,7 +6,7 @@ Version: 4.3.3
Maintainer: libzmq Developers <zeromq-dev@lists.zeromq.org>
Homepage: http://www.zeromq.org/
Standards-Version: 3.9.8
Build-Depends: debhelper (>= 9), dh-autoreconf, libkrb5-dev, libpgm-dev, libnorm-dev, libsodium-dev, libunwind-dev | libunwind8-dev | libunwind7-dev, pkg-config, asciidoc-base | asciidoc, xmlto
Build-Depends: debhelper (>= 9), dh-autoreconf, libkrb5-dev, libpgm-dev, libnorm-dev, libsodium-dev, libunwind-dev | libunwind8-dev | libunwind7-dev,
libnss3-dev,
pkg-config, asciidoc-base | asciidoc, xmlto
Package-List:
libzmq3-dev deb libdevel optional arch=any
libzmq5 deb libs optional arch=any
...
...
packaging/redhat/zeromq.spec
View file @
5dd43350
...
...
@@ -45,6 +45,13 @@ BuildRequires: libsodium-devel
%else
%define SODIUM no
%endif
%bcond_with nss
%if %{with nss}
BuildRequires: nss-devel
%define NSS yes
%else
%define NSS no
%endif
BuildRequires: gcc, make, gcc-c++, libstdc++-devel, asciidoc, xmlto
Requires: libstdc++
...
...
@@ -60,6 +67,7 @@ Requires: libstdc++
%{!?_with_libgssapi_krb5: %{!?_without_libgssapi_krb5: %define _without_libgssapi_krb5 --without-liblibgssapi_krb5}}
%{!?_with_libsodium: %{!?_without_libsodium: %define _without_libsodium --without-libsodium}}
%{!?_with_pgm: %{!?_without_pgm: %define _without_pgm --without-pgm}}
%{!?_with_nss: %{!?_without_nss: %define _without_nss --without-nss}}
# It's an error if both --with and --without options are specified
%{?_with_libgssapi_krb5: %{?_without_libgssapi_krb5: %{error: both _with_libgssapi_krb5 and _without_libgssapi_krb5}}}
...
...
@@ -75,6 +83,9 @@ Requires: libstdc++
%{?_with_pgm:BuildRequires: openpgm-devel}
%{?_with_pgm:Requires: openpgm}
%{?_with_nss:BuildRequires: nss-devel}
%{?_with_nss:Requires: nss}
%ifarch pentium3 pentium4 athlon i386 i486 i586 i686 x86_64
%{!?_with_pic: %{!?_without_pic: %define _with_pic --with-pic}}
%{!?_with_gnu_ld: %{!?_without_gnu_ld: %define _with_gnu_ld --with-gnu_ld}}
...
...
@@ -122,6 +133,10 @@ Requires: krb5-devel
%if %{with libsodium}
Requires: libsodium-devel
%endif
%bcond_with nss
%if %{with nss}
Requires: nss-devel
%endif
%description devel
The 0MQ lightweight messaging kernel is a library which extends the
...
...
@@ -163,6 +178,7 @@ autoreconf -fi
--with-pgm=%{PGM} \
--with-libsodium=%{SODIUM} \
--with-libgssapi_krb5=%{GSSAPI} \
--with-nss=%{NSS} \
%{?_with_pic} \
%{?_without_pic} \
%{?_with_gnu_ld} \
...
...
@@ -215,6 +231,9 @@ autoreconf -fi
%{_bindir}/curve_keygen
%changelog
* Wed Sep 11 2019 Luca Boccassi <luca.boccassi@gmail.com>
- Add macro for optional NSS dependency
* Sat Aug 19 2017 Luca Boccassi <luca.boccassi@gmail.com>
- Fix parsing and usage of conditionals for sodium/pgm/krb5 so that they work
in OBS
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment