Hi Hector!

On Wed, Mar 7, 2018 at 7:18 PM, Héctor Romojaro Gómez
<hector.romoj...@gmail.com> wrote:
> Hi Sergei,
>> > > * there are many Makefiles inside/usr/share/naviserver/include.
>> > > Please, get rid of them. Or they are useful in some way?
>> >
>> > Some of them are sourced by other naviserver modules, that will
>> > form
>> > part of the naviserver-modules package.
>> >
>> > For instance, nsdbpg's Makefile[1] includes
>> > /usr/share/naviserver/include/Makefile.module, which also includes
>> > /usr/share/naviserver/include/Makefile.global.
>> Okay then.
> After further inspection of the remaining files in the include
> directory, i have also noticed that they have some architecture
> dependant paths:
> $ grep x86_64-linux *
> Makefile.global:NAVISERVER       = /usr/lib/x86_64-linux-gnu/naviserver
> Makefile.global:NSLIBS      += -L/usr/lib/x86_64-linux-gnu -ltcl8.6 
> ${DL_LIBS} ${LIBS} ${MATH_LIBS} -Wl,-z,relro -Wl,-z,now -Wl,--export-dynamic  
> -L/usr/lib/x86_64-linux-gnu -lssl -lcrypto
> nsversion.h:#define NS_NAVISERVER       "/usr/lib/x86_64-linux-gnu/naviserver"

Good catch!

> ...so i have removed  "Multi-Arch: same" from naviserver-dev in the
> control file, for the time being.

I would also suggest to move the primary location of the include directory
to /usr/lib/<multiarch-triplet>/naviserver/include and create two symlinks:
/usr/include/naviserver -> /usr/lib/<multiarch-triplet>/naviserver/include
/usr/share/naviserver/include -> /usr/include/naviserver

This way /usr/share won't contain architecture dependent files.
(Multiarch: same is still out of question, though.)

> Aside from that, i have already fixed all the other issues, and pushed
> --force to salsa :)

About that. May I suggest you to never ever do anything that would require
using push --force? I'ts okay do do mistakes and fix them in the next commit,
you don't have to rewrite history (especially already published history,
it's good that I hadn't any local changes and could just reclone the repository,
and what if I had?)

Sergei Golovan

Pkg-tcltk-devel mailing list

Reply via email to