From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Date: Thu, 10 Apr 2014 20:35:27 +0400 From: Gleb Fotengauer-Malinovskiy To: "Sergey Y. Afonin" Message-ID: <20140410163526.GA23327@glebfm.cloud.tilaa.com> References: <532C0280.5040505@diyaorg.dp.ua> <2968462.LPYIYodVpG@epiphanov.bkpi82.nikiet.ru> <20140324123350.GB12757@altlinux.org> <201404100146.27487.asy@altlinux.ru> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="GZVR6ND4mMseVXL/" Content-Disposition: inline In-Reply-To: <201404100146.27487.asy@altlinux.ru> Cc: ALT Linux Team development discussions Subject: Re: [devel] =?utf-8?b?0J/RgNC40L3Rg9C00LjRgtC10LvRjNC90L4g0YPRgdGC?= =?utf-8?b?0LDQvdC+0LLQuNGC0Ywg0LLQtdGA0YHQuNGOIEdDQyDQsiBTUEVD?= X-BeenThere: devel@lists.altlinux.org X-Mailman-Version: 2.1.12 Precedence: list Reply-To: ALT Linux Team development discussions List-Id: ALT Linux Team development discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 10 Apr 2014 16:35:36 -0000 Archived-At: List-Archive: List-Post: --GZVR6ND4mMseVXL/ Content-Type: multipart/mixed; boundary="uZ3hkaAS1mZxFaxD" Content-Disposition: inline --uZ3hkaAS1mZxFaxD Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Thu, Apr 10, 2014 at 01:46:27AM +0400, Sergey Y. Afonin wrote: > =D0=9C=D0=BE=D0=B6=D0=B5=D1=82, =D0=B4=D0=B5=D0=BB=D0=B0=D1=82=D1=8C =D1= =83=D0=B4=D0=B0=D0=BB=D0=B5=D0=BD=D0=B8=D0=B5 gcc/gcc-c++, =D0=BE=D1=82=D0= =BB=D0=B8=D1=87=D0=BD=D1=8B=D1=85 =D0=BE=D1=82 X.Y, =D0=B5=D1=81=D0=BB=D0= =B8 =D0=BC=D0=B0=D0=BA=D1=80=D0=BE=D1=81 =D0=B5=D1=81=D1=82=D1=8C ? > =D0=98=D0=BB=D0=B8 =D1=87=D1=82=D0=BE-=D1=82=D0=BE =D0=BC=D0=B5=D1=88=D0= =B0=D0=B5=D1=82 ? =D0=A7=D1=82=D0=BE =D0=BC=D0=B5=D1=88=D0=B0=D0=B5=D1=82 =D0=B8=D1=81=D0=BF= =D0=BE=D0=BB=D1=8C=D0=B7=D0=BE=D0=B2=D0=B0=D1=82=D1=8C =D1=82=D0=BE=D1=82 g= cc, =D0=BA=D0=BE=D1=82=D0=BE=D1=80=D1=8B=D0=B9 =D0=B2=D0=B0=D0=BC =D0=BD=D1= =83=D0=B6=D0=B5=D0=BD =D0=B2=D0=BC=D0=B5=D1=81=D1=82=D0=BE =D1=82=D0=BE=D0= =B3=D0=BE, =D0=BA=D0=BE=D1=82=D0=BE=D1=80=D1=8B=D0=B9 =D0=BB=D0=B5=D0=B6=D0=B8=D1=82 =D0=B8 =D0=BD=D0=B5 =D0=BC=D0=B5=D1=88=D0=B0= =D0=B5=D1=82? > =D0=90 gccX.Y-=D1=81++ ? =D0=98=D0=BB=D0=B8, =D0=B2 =D1=8D=D1=82=D0=BE=D0= =BC =D1=81=D0=BB=D1=83=D1=87=D0=B0=D0=B5, "BuildRequires: gccX.Y-c++" =D1= =82=D1=80=D0=B5=D0=B1=D1=83=D0=B5=D1=82=D1=81=D1=8F > =D0=B2=D1=81=D1=91 =D1=80=D0=B0=D0=B2=D0=BD=D0=BE, =D0=B5=D1=81=D0=BB=D0= =B8 c++ =D0=BD=D0=B0=D0=B4=D0=BE ? =D0=94=D0=B0, =D1=82=D1=80=D0=B5=D0=B1=D1=83=D0=B5=D1=82=D1=81=D1=8F, =D1= =82=D0=B0=D0=BA=D0=B6=D0=B5 =D0=BA=D0=B0=D0=BA =D0=B8 =D0=B4=D0=BB=D1=8F = =D0=B2=D1=81=D0=B5=D1=85 gcc-=D1=87=D1=82=D0=BE-=D0=BD=D0=B8=D0=B1=D1=83=D0= =B4=D1=8C (=D1=83=D0=B4=D0=BE=D0=B1=D0=BD=D0=BE =D0=BF=D0=B8=D1=81=D0=B0=D1= =82=D1=8C 'gcc%{?_gcc_version}-=D1=87=D1=82=D0=BE-=D0=BD=D0=B8=D0=B1=D1=83=D0=B4=D1= =8C' =D0=B2=D0=BC=D0=B5=D1=81=D1=82=D0=BE gccX.Y-=D1=87=D1=82=D0=BE-=D0=BD= =D0=B8=D0=B1=D1=83=D0=B4=D1=8C). > =D0=98=D0=BB=D0=B8 =D1=8D=D1=82=D0=BE =D0=B2=D0=BE=D1=82 >=20 > Inconsistency detected by ld.so: dl-version.c: 224: _dl_check_map_version= s: Assertion `needed !=3D ((void *)0)' failed! > ldd: ERROR: ./usr/lib/xorp/bin/rip_show_stats: trace failed =D0=92=D0=BE=D0=B7=D0=BC=D0=BE=D0=B6=D0=BD=D0=BE, =D1=8D=D1=82=D0=BE =D0=BC= =D0=BE=D0=B6=D0=B5=D1=82 =D0=B1=D1=8B=D1=82=D1=8C =D1=80=D0=B5=D0=B7=D1=83= =D0=BB=D1=8C=D1=82=D0=B0=D1=82=D0=BE=D0=BC =D1=80=D0=B0=D0=B1=D0=BE=D1=82= =D1=8B chrpath. =D0=9F=D0=BE=D1=81=D0=BB=D0=B5 =D0=B5=D0=B3=D0=BE =D0=BE=D1= =82=D0=BA=D0=BB=D1=8E=D1=87=D0=B5=D0=BD=D0=B8=D1=8F =D1=82=D0=B0=D0=BA=D0=B8=D0=B5 =D0=BF=D1=80=D0=BE=D0=B1=D0=BB=D0=B5=D0=BC= =D1=8B =D1=83 =D0=BC=D0=B5=D0=BD=D1=8F =D0=B8=D1=81=D1=87=D0=B5=D0=B7=D0=B0= =D1=8E=D1=82. > =D0=BF=D0=BE=D1=81=D0=BB=D0=B5=D0=B4=D1=81=D1=82=D0=B2=D0=B8=D0=B5 =D0=BD= =D0=B5 gcc4.8, =D0=B0 =D1=87=D0=B5=D0=B3=D0=BE-=D1=82=D0=BE =D0=B4=D1=80=D1= =83=D0=B3=D0=BE=D0=B3=D0=BE ? =D0=A5=D0=BE=D1=82=D1=8F, =D0=B5=D1=81=D0=BB= =D0=B8 =D0=BF=D0=BE=D1=81=D0=BC=D0=BE=D1=82=D1=80=D0=B5=D1=82=D1=8C =D0=B2 = xorp-=D0=BE=D0=B2=D1=81=D0=BA=D0=B8=D0=B9 > git https://github.com/greearb/xorp.ct/tree/master/xorp, =D0=B2=D0=B8=D0= =B4=D0=BD=D0=BE, =D1=87=D1=82=D0=BE =D0=BA=D0=B0=D0=BA=D0=B8=D0=B5-=D1=82= =D0=BE > =D0=B8=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB=D0=B5=D0=BD=D0=B8=D1=8F =D0=B4= =D0=BB=D1=8F 4.8 =D0=B1=D1=8B=D0=BB=D0=B8 =D1=83=D0=B6=D0=B5, =D0=BF=D1=80= =D0=B0=D0=B2=D0=B4=D0=B0 =D0=B4=D0=B0=D0=B2=D0=BD=D0=BE. =D0=92=D1=8B =D1=82=D0=B0=D0=BA =D0=B3=D0=BE=D0=B2=D0=BE=D1=80=D0=B8=D1=82= =D0=B5, =D0=B1=D1=83=D0=B4=D1=82=D0=BE =D0=BC=D0=B5=D0=B6=D0=B4=D1=83 t6 = =D0=B8 =D0=A1=D0=B8=D0=B7=D0=B8=D1=84=D0=BE=D0=BC =D0=BC=D0=BE=D0=B3 =D0=B8= =D0=B7=D0=BC=D0=B5=D0=BD=D0=B8=D1=82=D1=8C=D1=81=D1=8F =D1=82=D0=BE=D0=BB= =D1=8C=D0=BA=D0=BE gcc. ;) =D0=90 =D0=B2 4.7 =D0=BF=D1=80=D0=B0=D0=B2=D0=B4=D0=B0 =D0=BA=D0=B0=D0=BA= =D0=BE=D0=B9-=D1=82=D0=BE internal error, =D0=B8=D1=81=D0=BF=D0=BE=D0=BB=D1= =8C=D0=B7=D1=83=D0=B9=D1=82=D0=B5 4.6. =D0=A2=D0=B0=D0=BA (=D1=81=D0=BC. diff) =D1=83 =D0=BC=D0=B5=D0=BD=D1=8F =D0= =B2=D1=81=D1=91 =D1=81=D0=BE=D0=B1=D0=B8=D1=80=D0=B0=D0=B5=D1=82=D1=81=D1= =8F (=D0=B2 =D0=A1=D0=B8=D0=B7=D0=B8=D1=84=D0=B5 =D0=BD=D0=B0 4.8, =D0=B2 t= 7 =D0=BD=D0=B0 4.6, =D0=B2 t6 =D0=BD=D0=B0 4.5) --=20 glebfm =20 =D0=93=D0=BB=D0=B5=D0=B1 =D0=A4=D0=BE=D1=82=D0=B5=D0=BD=D0=B3=D0=B0=D1=83= =D1=8D=D1=80-=D0=9C=D0=B0=D0=BB=D0=B8=D0=BD=D0=BE=D0=B2=D1=81=D0=BA=D0=B8= =D0=B9 --uZ3hkaAS1mZxFaxD Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename="xorp.spec.diff" Content-Transfer-Encoding: quoted-printable diff --git a/xorp.spec b/xorp.spec index c134a1f..4492f35 100644 --- a/xorp.spec +++ b/xorp.spec @@ -37,7 +37,7 @@ BuildRequires: chrpath =20 # Automatically added by buildreq on Tue Apr 08 2014 # optimized out: libstdc++-devel libtinfo-devel python-base python-modules= python-modules-compiler python-modules-email xz -BuildRequires: cvs flex gcc4.5-c++ libncurses-devel libpcap-devel libpc= re-devel libssl-devel scons +BuildRequires: cvs flex gcc-c++ libncurses-devel libpcap-devel libpcre-= devel libssl-devel scons =20 =20 %description @@ -53,9 +53,7 @@ functionality, including support for custom hardware and = software forwarding. =20 =20 %build -%set_gcc_version 4.5 - -scons -j4 \ +[ -n "$NPROCS" ] || NPROCS=3D'%__nprocs'; scons -j$NPROCS \ DESTDIR=3D${RPM_BUILD_ROOT} \ sbindir=3D%{_sbindir} \ prefix=3D%{prefixdir} \ @@ -63,6 +61,8 @@ scons -j4 \ sysconfdir=3D%{_sysconfdir} \ xorp_confdir=3D%{_sysconfdir} \ localstatedir=3D%{_localstatedir} \ + build=3D%_configure_platform \ + rtld_origin=3Dfalse \ %if %with_shared shared=3Dyes \ %endif @@ -92,6 +92,8 @@ scons \ sysconfdir=3D%{_sysconfdir} \ xorp_confdir=3D%{_sysconfdir} \ localstatedir=3D%{_localstatedir} \ + build=3D%_configure_platform \ + rtld_origin=3Dfalse \ %if %with_shared shared=3Dyes \ %endif @@ -106,15 +108,8 @@ scons \ %{__install} -m 0644 %{SOURCE3} ${RPM_BUILD_ROOT}%{_sysconfdir}/= logrotate.d/xorp %{__install} -m 0660 %{SOURCE4} ${RPM_BUILD_ROOT}%{_sysconfdir}/= xorp =20 - -# remove rpath -find %buildroot -type f -exec file {} \; | grep ELF | sed "s/^\([^ ]*\): E= LF.*/\1/" | \ - while read f; do chrpath -d $f; done - -%set_verify_elf_method unresolved=3Drelaxed - %pre -if ! getent group xorp >/dev/null 2>&1; then +if ! getent group xorp >/dev/null 2>&1; then /usr/sbin/groupadd -r xorp =20 # xorpsh is using group's permission for access to xorp. @@ -141,12 +136,12 @@ exit 0 %attr(660,root,xorp) %config(noreplace) %verify(not md5 size mtime) %{_sys= confdir}/xorp/xorp.conf =20 %dir %_datadir/%name -%dir %_libexecdir/%name +%dir /usr/lib/%name %dir %_logdir/%name =20 %_sbindir/* %_datadir/%name/* -%_libexecdir/%name/* +/usr/lib/%name/* =20 %changelog * Wed Apr 09 2014 Sergey Y. Afonin 1.8.6-alt0.20130830.1 --uZ3hkaAS1mZxFaxD Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename="xorp.spec.t7.diff" Content-Transfer-Encoding: quoted-printable diff --git a/xorp.spec b/xorp.spec index c134a1f..230b761 100644 --- a/xorp.spec +++ b/xorp.spec @@ -4,6 +4,7 @@ %define prefixdir /usr %define snapshot 1 =20 +%set_gcc_version 4.6 Name: xorp =20 %define baseversion 1.8.6 @@ -37,7 +38,7 @@ BuildRequires: chrpath =20 # Automatically added by buildreq on Tue Apr 08 2014 # optimized out: libstdc++-devel libtinfo-devel python-base python-modules= python-modules-compiler python-modules-email xz -BuildRequires: cvs flex gcc4.5-c++ libncurses-devel libpcap-devel libpc= re-devel libssl-devel scons +BuildRequires: cvs flex gcc%{?_gcc_version}-c++ libncurses-devel libpca= p-devel libpcre-devel libssl-devel scons =20 =20 %description @@ -53,9 +54,7 @@ functionality, including support for custom hardware and = software forwarding. =20 =20 %build -%set_gcc_version 4.5 - -scons -j4 \ +[ -n "$NPROCS" ] || NPROCS=3D'%__nprocs'; scons -j$NPROCS \ DESTDIR=3D${RPM_BUILD_ROOT} \ sbindir=3D%{_sbindir} \ prefix=3D%{prefixdir} \ @@ -63,6 +62,8 @@ scons -j4 \ sysconfdir=3D%{_sysconfdir} \ xorp_confdir=3D%{_sysconfdir} \ localstatedir=3D%{_localstatedir} \ + build=3D%_configure_platform \ + rtld_origin=3Dfalse \ %if %with_shared shared=3Dyes \ %endif @@ -92,6 +93,8 @@ scons \ sysconfdir=3D%{_sysconfdir} \ xorp_confdir=3D%{_sysconfdir} \ localstatedir=3D%{_localstatedir} \ + build=3D%_configure_platform \ + rtld_origin=3Dfalse \ %if %with_shared shared=3Dyes \ %endif @@ -106,15 +109,8 @@ scons \ %{__install} -m 0644 %{SOURCE3} ${RPM_BUILD_ROOT}%{_sysconfdir}/= logrotate.d/xorp %{__install} -m 0660 %{SOURCE4} ${RPM_BUILD_ROOT}%{_sysconfdir}/= xorp =20 - -# remove rpath -find %buildroot -type f -exec file {} \; | grep ELF | sed "s/^\([^ ]*\): E= LF.*/\1/" | \ - while read f; do chrpath -d $f; done - -%set_verify_elf_method unresolved=3Drelaxed - %pre -if ! getent group xorp >/dev/null 2>&1; then +if ! getent group xorp >/dev/null 2>&1; then /usr/sbin/groupadd -r xorp =20 # xorpsh is using group's permission for access to xorp. @@ -141,12 +137,12 @@ exit 0 %attr(660,root,xorp) %config(noreplace) %verify(not md5 size mtime) %{_sys= confdir}/xorp/xorp.conf =20 %dir %_datadir/%name -%dir %_libexecdir/%name +%dir /usr/lib/%name %dir %_logdir/%name =20 %_sbindir/* %_datadir/%name/* -%_libexecdir/%name/* +/usr/lib/%name/* =20 %changelog * Wed Apr 09 2014 Sergey Y. Afonin 1.8.6-alt0.20130830.1 --uZ3hkaAS1mZxFaxD-- --GZVR6ND4mMseVXL/ Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iEYEARECAAYFAlNGyE4ACgkQGIt2Es9CnfuyAwCfYy0gmmy89U7K+bSp6sH79xGZ p3UAnRbNDzaiLqg1tWRyxtWScpOkNkzh =+RgY -----END PGP SIGNATURE----- --GZVR6ND4mMseVXL/--