[SCM] yoshimi/master: Update patch.

[Jaromír Mikeš]

2014-03-20 16:08 GMT+01:00 Felipe Sateler <fsateler at debian.org>:

> On Thu, Mar 20, 2014 at 11:44 AM, Jaromír Mikeš <mira.mikes at gmail.com>
> wrote:
> >
> >
> >
> > 2014-03-20 14:30 GMT+01:00 Felipe Sateler <fsateler at debian.org>:
> >
> >> On Thu, Mar 20, 2014 at 10:06 AM, Jaromír Mikeš <mira.mikes at gmail.com>
> >> wrote:
> >> > 2014-03-20 13:23 GMT+01:00 <mira-guest at users.alioth.debian.org>:
> >> >>
> >> >> The following commit has been merged in the master branch:
> >> >> commit c841640a6dc119dce9f85f8d65f09c5a2a753f02
> >> >> Author: Jaromír Mikeš <mira.mikes at seznam.cz>
> >> >> Date:   Thu Mar 20 13:23:01 2014 +0100
> >> >>
> >> >>     Update patch.
> >> >>
> >> >> diff --git a/debian/patches/01-gcc_flags.patch
> >> >> b/debian/patches/01-gcc_flags.patch
> >> >> index d9f88dc..72b02c8 100644
> >> >> --- a/debian/patches/01-gcc_flags.patch
> >> >> +++ b/debian/patches/01-gcc_flags.patch
> >> >> @@ -9,14 +9,14 @@ Forwarded: yes
> >> >>
> >> >>  Index: yoshimi/src/CMakeLists.txt
> >> >>  ===================================================================
> >> >> ---- yoshimi.orig/src/CMakeLists.txt    2014-03-17 00:55:47.478391726
> >> >> +0100
> >> >> -+++ yoshimi/src/CMakeLists.txt 2014-03-17 00:55:47.474391845 +0100
> >> >> +--- yoshimi.orig/src/CMakeLists.txt    2014-03-20 12:26:13.702271262
> >> >> +0100
> >> >> ++++ yoshimi/src/CMakeLists.txt 2014-03-20 12:27:18.278644212 +0100
> >> >>  @@ -81,6 +81,9 @@
> >> >>   set (BuildOptionsDebug
> >> >>       "-O0 -g3 -ggdb -Wall -Wpointer-arith -ldl" CACHE STRING "Debug
> >> >> build
> >> >> flags")
> >> >>
> >> >>  +set (BuildOptionsDebian
> >> >> -+    "-O3 -ffast-math -fomit-frame-pointer" CACHE STRING "Debian
> build
> >> >> flags")
> >> >> ++    "-O3 -ffast-math -fomit-frame-pointer -ldl" CACHE STRING
> "Debian
> >> >> build flags")
> >> >>  +
> >> >>   find_package (PkgConfig REQUIRED)
> >> >>   if (PKG_CONFIG_FOUND)
> >> >
> >> >
> >> > Hi,
> >> >
> >> > again having difficulty to pass flags ... Now LDFLAGS are problematic.
> >> > If I will patch CMakeLists.txt and add -z relro directly things
> working
> >> > but
> >> > I am not able pass flags via LDFLAGS variable. :(
> >> >
> >> > "-O3 -ffast-math -fomit-frame-pointer -ldl -z relro" CACHE STRING
> >> > "Debian
> >> > build flags")
> >> >
> >> > any idea?
> >>
> >> The variables are CMAKE_EXE_LINKER_FLAGS, CMAKE_MODULE_LINKER_FLAGS
> >> and CMAKE_SHARED_LINKER_FLAGS.
> >>
> >> You should probably do the same with the cflags CMAKE_C_FLAGS and
> >> CMAKE_CXX_FLAGS instead of patching the CMakeLists.txt.
> >
> >
> > Surprisingly just LDFLAGS don't works.
> >
> > I added this to rules file but still no success.
> > CMAKE_EXE_LINKER_FLAGS+=$(LDFLAGS)
> > CMAKE_MODULE_LINKER_FLAGS+=$(LDFLAGS)
> > CMAKE_SHARED_LINKER_FLAGS+=$(LDFLAGS)
> >
> > Can this line 360 from CMakeLists.txt be problematic? Because I see in
> build
> > log section "linking" to be -ldl passed twice.
> >
> > set (CMAKE_EXE_LINKER_FLAGS "-ldl")
> >
> > To change set to add or sth like this?
>
> Yes, it is related, as the CMakeLists.txt is overriding the setting.
> You should probably remove that line and add dl to the
> target_link_libraries call just a couple of lines after.


Works! Thank you!

mira
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.alioth.debian.org/pipermail/pkg-multimedia-maintainers/attachments/20140320/31ab3166/attachment.html>