None
closed
nobody
None
2019-01-20
2018-12-16
jk
No

Commit 40859df8f2c65015ad6cca6028821eff72b6ef83 adds -I$(includedir)/libupnpp to AM_CPPFLAGS in Makefile.am.

When cross-compiling upmpdcli includedir is set to the target path /usr/include/libupnpp, whereas the libupnpp header files are located in the sysroot path, e.g.$HOME/sysroot/usr/include/libupnpp.

The result is, that the log.h is not found:

src/mediaserver/cdplugins/bufxchange.h:27:17: fatal error: log.h: No such file or directory #include "log.h"

Is there any need to not include <libupnpp/log.h> instead of using "log.h"?

Discussion

  • medoc
    medoc
    2019-01-13

    In the master branch, all files which can't include libupnpp/log.h, but instead need log.h because they are used in other packages now use the following to include log.h:

    #ifdef MDU_INCLUDE_LOG
    #include MDU_INCLUDE_LOG
    #else
    #include "log.h"
    #endif
    

    This way, the Makefile can define MDU_INCLUDE_LOG as it likes (e.g as <libupnpp/log.h> for upmpdcli).

    I guess that the modification is innocuous enough to be backported to 1.3, it gets rid of the preposterous file editing which is done there (and apparently, not done, for bufxchange.h).

    So maybe check that the current approach in the master branch works for you, and I'll then backport it.

    And don't ask what MDU means because I just don't remember :)

     
    Last edit: medoc 2019-01-13
    • jk
      jk
      2019-01-15

      I can confirm that master branch is working for me. Thanks!

       
  • medoc
    medoc
    2019-01-15

    Do you need it in 1.3 ?

     
    • jk
      jk
      2019-01-15

      Yes :-)

       
  • medoc
    medoc
    2019-01-16

    Ok, so I've decided that I was tired of maintaining 2 branches for no good reason (nothing much going on currently), so 1.4.0 is out.

    I guess that the simplest approach for 1.3 would be to add a patch to fix your file (either with the config variable trick or by just editing the line)?

     
  • medoc
    medoc
    2019-01-20

    • status: open --> closed
    • milestone: -->
     

Cancel   Add attachment