- Re: [PATCH] installing zipconf.h into includedir?, (continued)
- Re: [PATCH] installing zipconf.h into includedir?, Remi Collet (2018/01/02 06:36:48)
Hi dillo, On Tuesday, January 2, 2018 2:13:12 PM CET Dieter Baron wrote: > > > On 02.01.2018, at 09:52 , Pavel Raiskup <praiskup%redhat.com@localhost> > > wrote: > > > > > > On Tuesday, January 2, 2018 9:26:45 AM CET Thomas Klausner wrote: > >> On Tue, Jan 02, 2018 at 07:30:21AM +0100, Remi Collet wrote: > >>> zipconf.h is different (again) on 32/64 bit > >>> so this change have to be reverted > >>> > >>> See: https://bugzilla.redhat.com/1529886 > >> > >> Is there no include64 directory or similar? > > > > Nothing I know about. > > > >> After 1.4.0, I've fixed the installation so you can pass it an include > >> directory. Is that sufficient? > > > > If both zip.h and zipconf.h go to include dir, we can not change includedir. > > > >> Pavel (who requested the change): What does your distribution do > >> about this? > > > > With Remi, we both work on Fedora. We do the "hack" after 'make install'; > > we move zipconf.h to zipconf-<ARCH>.h, and replace the zipconf.h with > > something like: > > > > #if defined(__x86_64__) > > #include "pg_config-x86_64.h" > > #elif defined(__i386__) > > #include "pg_config-i386.h" > > .... > > > > So the 'zipconf.h' (included from 'zip.h') is the same on all > > architectures. This wrapper header is though specific for fedora, I don't > > think it can be used as an upstream solution. > > > > So I think the 'zipconf.h' should be fixed so it is multilib-clean again, > > as it was before (when it was generated by make_zipconf.sh). > > Could you please send us the two versions of zipconf.h so we can see how to > fix this? I would have to re-install the packages and spent few more minutes to give you the full version, but the diff between zipconf-x86_64.h and zipconf-i386.h is in bug  mentioned above. You can extract the generated files for other architectures from RPMs referenced in . Basically, those two files differ only in LONG_LIBZIP define (4 vs. 8 bytes).  >>> See: https://bugzilla.redhat.com/1529886  https://koji.fedoraproject.org/koji/buildinfo?buildID=1012161 Pavel
Made by MHonArc.