From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.2.5 (2008-06-10) on sa.int.altlinux.org X-Spam-Level: X-Spam-Status: No, score=-2.2 required=5.0 tests=AWL,BAYES_00 autolearn=ham version=3.2.5 Date: Tue, 24 Nov 2009 16:30:24 +0500 From: Andrey Rahmatullin To: devel@lists.altlinux.org Message-ID: <20091124113023.GR25872@wrars-comp.wrarsdomain> References: <20091116200543.GV6266@wrars-comp.wrarsdomain> <20091121144323.GK25872@wrars-comp.wrarsdomain> <20091122231157.GA24229@wo.int.altlinux.org> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="TYoqghpzCwoKvQG2" Content-Disposition: inline In-Reply-To: <20091122231157.GA24229@wo.int.altlinux.org> X-Operating-System: ALT Linux Sisyphus X-Jabber-Id: wrar@altlinux.org User-Agent: Mutt/1.5.20 (2009-06-23) Subject: Re: [devel] RFC: %cmake 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: Tue, 24 Nov 2009 11:30:44 -0000 Archived-At: List-Archive: List-Post: --TYoqghpzCwoKvQG2 Content-Type: multipart/mixed; boundary="rE45P3aZNSuYx5ND" Content-Disposition: inline --rE45P3aZNSuYx5ND Content-Type: text/plain; charset=koi8-r Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Mon, Nov 23, 2009 at 02:11:58AM +0300, Dmitry V. Levin wrote: > Please fix build of cdrkit-1.1.9.832-alt3: >=20 > In file included from /usr/src/RPM/BUILD/cdrkit-1.1.9.832/libunls/nls_bas= e.c:42: > /usr/src/RPM/BUILD/cdrkit-1.1.9.832/libunls/../include/mconfig.h:59:70: e= rror: xconfig.h: No such file or directory =E7=CF=D4=CF=D7=CF. =EE=C1 =D3=D4=C1=D2=D9=C8 cmake, =D0=D2=C1=D7=C4=C1, = =D3=CF=C2=C9=D2=C1=D4=D8=D3=D1 =CE=C5 =C2=D5=C4=C5=D4, =CE=CF =C9=DA=CD=C5= =CE=C5=CE=C9=C5 =C4=CC=D1 =D0=CF=CC=D5=DE=C5=CE=C9=D1 =D5=CE=C9=D7=C5=D2=D3=C1=CC=D8=CE=CF= =C7=CF =D0=C1=D4=DE=C1 =D4=D2=C9=D7=C9=C1=CC=D8=CE=CF (=D3=C5=CA=DE=C1=D3 = =D0=C1=D4=DE =CD=C5=CE=D1=C5=D4 =D3=D4=C1=D2=D9=CA =D0=D5=D4=D8 =CE=C1 =CE=CF=D7=D9=CA, =D7=CD=C5=D3=D4=CF =DC=D4=CF=C7=CF =CD= =CF=D6=CE=CF =C4=CF=C2=C1=D7=CC=D1=D4=D8 =CE=CF=D7=D9=CA, =CF=D3=D4=C1=D7= =CC=D1=D1 =D3=D4=C1=D2=D9=CA). =F2=C1=CE=D8=DB=C5 configure_file() =CB=CC=C1=CC =D2=C5=DA=D5=CC=D8=D4=C1= =D4=D9 =D7 =CB=CF=D2=C5=CE=D8 =C2=C9=CE=C1=D2=CE=CF=C7=CF =C4=C5=D2=C5=D7= =C1, =D3=C5=CA=DE=C1=D3 =D3=CF=C8=D2=C1=CE=D1=C5=D4 =D0=D5=D4=C9: Teach configure_file to handle relative paths The configure_file() command now converts relative output paths to full paths using the current binary directory. Input relative paths were already converted using the current source directory, but this behavior was not previously documented. http://public.kitware.com/cgi-bin/viewcvs.cgi/Source/cmConfigureFileCommand= =2Ecxx?revision=3D1.36&root=3DCMake&view=3Dmarkup =EB=C1=D6=C5=D4=D3=D1, =CF=C2=D9=DE=CE=CF =DC=D4=CF =CE=C5=DA=C1=CD=C5=D4= =CE=CF, =D4.=CB. config.h.in =CC=C5=D6=C9=D4 =D7 =CB=CF=D2=CE=C5. =F7 cdrkit xconfig.h.in =CC=C5=D6=C9=D4 =D7 /include =C9 =C4=CF 2.8.0 xconfig.h =D3=CF= =DA=C4=C1=D7=C1=CC=D3=D1 =D7 /build/, =C1 =D4=C5=D0=C5=D2=D8 =D3=CF=DA=C4=C1=A3=D4=D3=D1 =D7 /build/include/. --=20 WBR, wRAR (ALT Linux Team) Powered by the ALT Linux fortune(6): > =E4=C1 =D4=D9 =CE=C9=CB=C1=CB =CE=C1 =D0=C1=CD=D1=D4=CE=C9=CB =D0=D2=C9 = =D6=C9=DA=CE=C9 =CE=C1=C2=C9=D7=C1=C5=DB=D8=D3=D1, =CF=D4 =D7=D3=D4=D2=CF= =C5=CE=CE=D9=C8 > =D0=CF=CC=D8=DA=CF=D7=C1=D4=C5=CC=C5=CA? ;-) =EE=D5, =DC=D4=CF... (=D3=CB=D2=CF=CD=CE=CF =D0=CF=D4=D5=D0=C9=D7 =D7=DA=CF= =D2)... =CE=C5 =D0=C5=D2=D7=D9=CA. =F7 =D3=CD=D9=D3=CC=C5, =D0=C1=CD=D1=D4=CE=C9=CB :-) -- morozov in sisyphus@ --rE45P3aZNSuYx5ND Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename="cdrkit-1.1.9-alt-cmake2.8-fix.patch" Content-Transfer-Encoding: quoted-printable diff --git a/cdrkit/genisoimage/CMakeLists.txt b/cdrkit/genisoimage/CMakeLi= sts.txt index 8ea911e..2b552bd 100644 --- a/cdrkit/genisoimage/CMakeLists.txt +++ b/cdrkit/genisoimage/CMakeLists.txt @@ -3,7 +3,7 @@ PROJECT (MKISOFS C) INCLUDE(../include/AddScgBits.cmake) INCLUDE(../include/AddSchilyBits.cmake) =20 -INCLUDE_DIRECTORIES(../include ../libhfs_iso ../wodim ${CMAKE_BINARY_DIR}) +INCLUDE_DIRECTORIES(../include ../libhfs_iso ../wodim ${CMAKE_BINARY_DIR}/= include) =20 INCLUDE(CheckIncludeFiles) CHECK_INCLUDE_FILES("magic.h" USE_MAGIC) diff --git a/cdrkit/icedax/CMakeLists.txt b/cdrkit/icedax/CMakeLists.txt index 79b99ec..924d79b 100644 --- a/cdrkit/icedax/CMakeLists.txt +++ b/cdrkit/icedax/CMakeLists.txt @@ -1,5 +1,5 @@ PROJECT (icedax C) -INCLUDE_DIRECTORIES(../include ../wodim ../libparanoia ${CMAKE_BINARY_DIR}) +INCLUDE_DIRECTORIES(../include ../wodim ../libparanoia ${CMAKE_BINARY_DIR}= /include) include(../include/AddScgBits.cmake) include(../include/AddSchilyBits.cmake) include(../include/AddNetworkBits.cmake) diff --git a/cdrkit/libedc/CMakeLists.txt b/cdrkit/libedc/CMakeLists.txt index e33a5b5..c267864 100644 --- a/cdrkit/libedc/CMakeLists.txt +++ b/cdrkit/libedc/CMakeLists.txt @@ -1,5 +1,5 @@ PROJECT (LIBEDC C) -INCLUDE_DIRECTORIES(../include . ${CMAKE_BINARY_DIR}) +INCLUDE_DIRECTORIES(../include . ${CMAKE_BINARY_DIR}/include) =20 AUX_SOURCE_DIRECTORY(. LIBEDC_SRCS) =20 diff --git a/cdrkit/libhfs_iso/CMakeLists.txt b/cdrkit/libhfs_iso/CMakeList= s.txt index bae664c..30d8cb1 100644 --- a/cdrkit/libhfs_iso/CMakeLists.txt +++ b/cdrkit/libhfs_iso/CMakeLists.txt @@ -1,5 +1,5 @@ PROJECT (LIBhfs_iso C) -INCLUDE_DIRECTORIES(../include ../libhfs_iso ../wodim ${CMAKE_BINARY_DIR}) +INCLUDE_DIRECTORIES(../include ../libhfs_iso ../wodim ${CMAKE_BINARY_DIR}/= include) ADD_DEFINITIONS(-DUSE_LARGEFILES -DABORT_DEEP_ISO_ONLY -DAPPLE_HYB -DUDF -= DDVD_VIDEO -DSORTING -DHAVE_CONFIG_H -DUSE_LIBSCHILY -DUSE_SCG) =20 =20 diff --git a/cdrkit/libparanoia/CMakeLists.txt b/cdrkit/libparanoia/CMakeLi= sts.txt index 006ae0a..94847e4 100644 --- a/cdrkit/libparanoia/CMakeLists.txt +++ b/cdrkit/libparanoia/CMakeLists.txt @@ -1,5 +1,5 @@ PROJECT (LIBparanoia C) -INCLUDE_DIRECTORIES(../include ${CMAKE_BINARY_DIR} ../wodim) +INCLUDE_DIRECTORIES(../include ${CMAKE_BINARY_DIR}/include ../wodim) ADD_DEFINITIONS(-DHAVE_CONFIG_H) SET(LIBparanoia_SRCS gap.c isort.c overlap.c p_block.c paranoia.c pmalloc.= c) =20 diff --git a/cdrkit/librols/CMakeLists.txt b/cdrkit/librols/CMakeLists.txt index 2158f94..427ca8c 100644 --- a/cdrkit/librols/CMakeLists.txt +++ b/cdrkit/librols/CMakeLists.txt @@ -1,5 +1,5 @@ PROJECT (LIBROLS C) -INCLUDE_DIRECTORIES(../include ../libhfs_iso ${CMAKE_BINARY_DIR} ../wodim) +INCLUDE_DIRECTORIES(../include ../libhfs_iso ${CMAKE_BINARY_DIR}/include .= =2E/wodim) =20 SET(LIBROLS_SRCS astoi.c astoll.c astoull.c breakline.c cmpbytes.c comerr= =2Ec error.c fexec.c fillbytes.c getargs.c getav0.c getdomainname.c geterrn= o.c gethostid.c gethostname.c getpagesize.c handlecond.c movebytes.c raisec= ond.c rename.c saveargs.c seterrno.c spawn.c strcatl.c strdup.c streql.c sw= abbytes.c usleep.c stdio/cvmod.c stdio/dat.c stdio/fcons.c stdio/fdown.c st= dio/fdup.c stdio/ffileread.c stdio/ffilewrite.c stdio/fgetline.c stdio/file= _raise.c stdio/fileclose.c stdio/fileluopen.c stdio/filemopen.c stdio/fileo= pen.c stdio/filepos.c stdio/fileread.c stdio/filereopen.c stdio/fileseek.c= stdio/filesize.c stdio/filestat.c stdio/filewrite.c stdio/flag.c stdio/flu= sh.c stdio/fpipe.c stdio/niread.c stdio/niwrite.c stdio/nixread.c stdio/nix= write.c stdio/openfd.c stdio/peekc.c default.c) =20 diff --git a/cdrkit/libunls/CMakeLists.txt b/cdrkit/libunls/CMakeLists.txt index 6faf636..48bd75d 100644 --- a/cdrkit/libunls/CMakeLists.txt +++ b/cdrkit/libunls/CMakeLists.txt @@ -1,5 +1,5 @@ PROJECT (LIBunls C) -INCLUDE_DIRECTORIES(../include ../libhfs_iso ../wodim ${CMAKE_BINARY_DIR}) +INCLUDE_DIRECTORIES(../include ../libhfs_iso ../wodim ${CMAKE_BINARY_DIR}/= include) ADD_DEFINITIONS(-DHAVE_CONFIG_H) =20 IF(HAVE_ICONV_H) diff --git a/cdrkit/libusal/CMakeLists.txt b/cdrkit/libusal/CMakeLists.txt index 1e59dc5..2e87017 100644 --- a/cdrkit/libusal/CMakeLists.txt +++ b/cdrkit/libusal/CMakeLists.txt @@ -1,5 +1,5 @@ PROJECT (LIBSCG C) -INCLUDE_DIRECTORIES(../include ${CMAKE_BINARY_DIR}) +INCLUDE_DIRECTORIES(../include ${CMAKE_BINARY_DIR}/include) include(../include/AddScgBits.cmake) ADD_DEFINITIONS(-DUSE_RCMD_RSH) =20 diff --git a/cdrkit/netscsid/CMakeLists.txt b/cdrkit/netscsid/CMakeLists.txt index 9d2263c..8eaab8c 100644 --- a/cdrkit/netscsid/CMakeLists.txt +++ b/cdrkit/netscsid/CMakeLists.txt @@ -1,5 +1,5 @@ PROJECT (netscsid C) -INCLUDE_DIRECTORIES(../include ../wodim ${CMAKE_BINARY_DIR} ) +INCLUDE_DIRECTORIES(../include ../wodim ${CMAKE_BINARY_DIR}/include ) INCLUDE(../include/AddScgBits.cmake) INCLUDE(../include/AddSchilyBits.cmake) INCLUDE(../include/AddNetworkBits.cmake) diff --git a/cdrkit/readom/CMakeLists.txt b/cdrkit/readom/CMakeLists.txt index 35a7b6d..a71e2fc 100644 --- a/cdrkit/readom/CMakeLists.txt +++ b/cdrkit/readom/CMakeLists.txt @@ -1,5 +1,5 @@ PROJECT (READECD C) -INCLUDE_DIRECTORIES(../include ../wodim ${CMAKE_BINARY_DIR}) +INCLUDE_DIRECTORIES(../include ../wodim ${CMAKE_BINARY_DIR}/include) INCLUDE(../include/AddScgBits.cmake) INCLUDE(../include/AddSchilyBits.cmake) =20 diff --git a/cdrkit/wodim/CMakeLists.txt b/cdrkit/wodim/CMakeLists.txt index 80f3f12..1cb97f5 100644 --- a/cdrkit/wodim/CMakeLists.txt +++ b/cdrkit/wodim/CMakeLists.txt @@ -1,5 +1,5 @@ PROJECT (CDRECORD C) -INCLUDE_DIRECTORIES(../include ../libedc ${CMAKE_BINARY_DIR}) +INCLUDE_DIRECTORIES(../include ../libedc ${CMAKE_BINARY_DIR}/include) INCLUDE(../include/AddScgBits.cmake) include(../include/AddSchilyBits.cmake) =20 --rE45P3aZNSuYx5ND-- --TYoqghpzCwoKvQG2 Content-Type: application/pgp-signature; name="signature.asc" Content-Description: Digital signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.10 (GNU/Linux) iQEcBAEBCAAGBQJLC8POAAoJEOih81koZvPB110H/1CQR9dsns2SYyU4479qlEth ZLdEHSJ9+XaKk0LK4pAwzz9f0QGSmILi6nA0gcmIuGCo1DDooQF3LOaMnxBGLzyw 3R6pMvZOdSfylFFWDastIZOk2xmCq9Q0zSIvvMF+lW9/Wx9HxKXuj3iuH+Uhn+MN Kneom9iHFj0auh3xwFt6MkJupvfmfs5HtcSGkafbgKNBypcrj1/1XY9YXsT0eGEg fRpIGQ5dPlu++Ku0F8CZwsgyN8KvGsvGpjg9YfIpcVTwl0tBTD9FmbUShP2BMuBq yfVWJhBGnrhOSqAltje2AM1mgiw04+mv6KA+4I2prYlysdMli7Psk8lFTdJK8Vc= =SWLl -----END PGP SIGNATURE----- --TYoqghpzCwoKvQG2--