Ticket #28070: patch-build-for-gcc46.diff

File patch-build-for-gcc46.diff, 9.0 KB (added by julians37@…, 13 years ago)

  • configure 

    diff -ru ../darktable-0.7.1-orig/configure ./configure
    old new  
    1203812038      ;;
    1203912039
    1204012040    bsdi[45]*)
    12041       export_dynamic_flag_spec=-rdynamic
     12041      export_dynamic_flag_spec=
    1204212042      ;;
    1204312043
    1204412044    cygwin* | mingw* | pw32* | cegcc*)

  • src/Makefile.am 

    diff -ru ../darktable-0.7.1-orig/src/Makefile.am ./src/Makefile.am
    old new  
    11SUBDIRS=LibRaw iop views libs imageio # gegl-operations
    22include shared.am
    3 AM_CFLAGS+=-Werror -rdynamic -Wno-deprecated-declarations
     3AM_CFLAGS+=-Werror -Wno-deprecated-declarations -Wno-error=unused-but-set-variable
    44AM_CPPFLAGS=$(OPENEXR_CFLAGS)
    55libdarktable_LTLIBRARIES=libdarktable.la
    66libdarktabledir=$(libdir)/darktable

  • src/Makefile.in 

    diff -ru ../darktable-0.7.1-orig/src/Makefile.in ./src/Makefile.in
    old new  
    404404        $(SQLITE_CFLAGS) $(OPENMP_CFLAGS) $(GCONF_CFLAGS) \
    405405        -fno-strict-aliasing -Wall -std=c99 -I$(srcdir)/LibRaw -fPIC \
    406406        -DDATADIR=\"$(datadir)/darktable\" -DLIBDIR=\""$(libdir)"\" \
    407         -Werror -rdynamic -Wno-deprecated-declarations
     407        -Werror -Wno-deprecated-declarations  -Wno-error=unused-but-set-variable
    408408AM_CXXFLAGS = $(GNOME_KEYRING_CFLAGS) $(GPHOTO2_CFLAGS) $(GEGL_CFLAGS) $(DBUSGLIB_CFLAGS) $(EXIV2_CFLAGS) $(CAIRO_CFLAGS) $(GLADE_CFLAGS) $(GTK_CFLAGS) $(GTHREAD_CFLAGS) $(SQLITE_CFLAGS) $(OPENMP_CFLAGS) $(GCONF_CFLAGS) -fno-strict-aliasing -Wall -I$(srcdir)/LibRaw -fPIC -DDATADIR=\"$(datadir)/darktable\" -DLIBDIR=\""$(libdir)"\"
    409409AM_CPPFLAGS = $(OPENEXR_CFLAGS)
    410410libdarktable_LTLIBRARIES = libdarktable.la

  • src/imageio/format/Makefile.am 

    diff -ru ../darktable-0.7.1-orig/src/imageio/format/Makefile.am ./src/imageio/format/Makefile.am
    old new  
    11include $(srcdir)/../../shared.am
    22LDFLAGS= -module -avoid-version
    3 CFLAGS+=$(AM_CFLAGS) -I$(srcdir) -I$(srcdir)/../.. -Werror -g -rdynamic
    4 CXXFLAGS+=$(AM_CXXFLAGS) $(OPENEXR_CFLAGS) -I$(srcdir) -I$(srcdir)/../.. -Werror -g -rdynamic
     3CFLAGS+=$(AM_CFLAGS) -I$(srcdir) -I$(srcdir)/../.. -Werror -Wno-error=unused-but-set-variable -g
     4CXXFLAGS+=$(AM_CXXFLAGS) $(OPENEXR_CFLAGS) -I$(srcdir) -I$(srcdir)/../.. -Werror -Wno-error=unused-but-set-variable -g
    55LTADD=$(OPENMP_CFLAGS) $(GEGL_LIBS) $(JPEG_LIBS) $(PNG_LIBS) $(LCMS_LIBS) $(EXIV2_LIBS) $(CAIRO_LIBS) $(GLADE_LIBS) $(GTK_LIBS) $(GTHREAD_LIBS) $(SQLITE_LIBS) -fPIC
    66libjpeg_la_SOURCES=jpeg.c
    77libpng_la_SOURCES=png.c

  • src/imageio/format/Makefile.in 

    diff -ru ../darktable-0.7.1-orig/src/imageio/format/Makefile.in ./src/imageio/format/Makefile.in
    old new  
    162162CC = @CC@
    163163CCDEPMODE = @CCDEPMODE@
    164164CFLAGS = @CFLAGS@ $(AM_CFLAGS) -I$(srcdir) -I$(srcdir)/../.. -Werror \
    165         -g -rdynamic
     165        -Wno-error=unused-but-set-variable -g
    166166CPP = @CPP@
    167167CPPFLAGS = @CPPFLAGS@
    168168CURL_CFLAGS = @CURL_CFLAGS@
    … …  
    171171CXXCPP = @CXXCPP@
    172172CXXDEPMODE = @CXXDEPMODE@
    173173CXXFLAGS = @CXXFLAGS@ $(AM_CXXFLAGS) $(OPENEXR_CFLAGS) -I$(srcdir) \
    174         -I$(srcdir)/../.. -Werror -g -rdynamic
     174        -I$(srcdir)/../.. -Werror -Wno-error=unused-but-set-variable -g
    175175CYGPATH_W = @CYGPATH_W@
    176176DATADIRNAME = @DATADIRNAME@
    177177DBUSGLIB_CFLAGS = @DBUSGLIB_CFLAGS@

  • src/imageio/storage/Makefile.am 

    diff -ru ../darktable-0.7.1-orig/src/imageio/storage/Makefile.am ./src/imageio/storage/Makefile.am
    old new  
    11include $(srcdir)/../../shared.am
    22LDFLAGS= -module -avoid-version
    3 CFLAGS+=$(AM_CFLAGS) -I$(srcdir) -I$(srcdir)/../.. -Werror -g -rdynamic
     3CFLAGS+=$(AM_CFLAGS) -I$(srcdir) -I$(srcdir)/../.. -Werror -Wno-error=unused-but-set-variable -g
    44LDADD=$(OPENMP_CFLAGS) $(GEGL_LIBS) $(CURL_LIBS) $(JPEG_LIBS) $(PNG_LIBS) $(LCMS_LIBS) $(EXIV2_LIBS) $(CAIRO_LIBS) $(GLADE_LIBS) $(GTK_LIBS) $(GTHREAD_LIBS) $(SQLITE_LIBS) -fPIC
    55libdisk_la_SOURCES=disk.c
    66libpicasa_la_SOURCES=picasa.c

  • src/imageio/storage/Makefile.in 

    diff -ru ../darktable-0.7.1-orig/src/imageio/storage/Makefile.in ./src/imageio/storage/Makefile.in
    old new  
    134134CC = @CC@
    135135CCDEPMODE = @CCDEPMODE@
    136136CFLAGS = @CFLAGS@ $(AM_CFLAGS) -I$(srcdir) -I$(srcdir)/../.. -Werror \
    137         -g -rdynamic
     137        -Wno-error=unused-but-set-variable -g
    138138CPP = @CPP@
    139139CPPFLAGS = @CPPFLAGS@
    140140CURL_CFLAGS = @CURL_CFLAGS@

  • src/iop/Makefile.am 

    diff -ru ../darktable-0.7.1-orig/src/iop/Makefile.am ./src/iop/Makefile.am
    old new  
    11include $(srcdir)/../shared.am
    22LDFLAGS= -module -avoid-version
    3 CFLAGS+=$(AM_CFLAGS) -I$(srcdir) -I$(srcdir)/..  -I$(srcdir)/dtgtk -Werror -g $(RSVG_CFLAGS)
    4 CXXFLAGS+=$(AM_CPPFLAGS) -I$(srcdir) -I$(srcdir)/..  -I$(srcdir)/dtgtk -Werror -g
     3CFLAGS+=$(AM_CFLAGS) -I$(srcdir) -I$(srcdir)/..  -I$(srcdir)/dtgtk -Werror -g -Wno-error=unused-but-set-variable $(RSVG_CFLAGS)
     4CXXFLAGS+=$(AM_CPPFLAGS) -I$(srcdir) -I$(srcdir)/..  -I$(srcdir)/dtgtk -Werror -g -Wno-error=unused-but-set-variable
    55LTADD=$(GEGL_LIBS) $(CAIRO_LIBS) $(GLADE_LIBS) $(GTK_LIBS) $(GTHREAD_LIBS) $(SQLITE_LIBS) -fPIC
    66libtonecurve_la_SOURCES=tonecurve.c
    77libgamma_la_SOURCES=gamma.c

  • src/iop/Makefile.in 

    diff -ru ../darktable-0.7.1-orig/src/iop/Makefile.in ./src/iop/Makefile.in
    old new  
    286286CC = @CC@
    287287CCDEPMODE = @CCDEPMODE@
    288288CFLAGS = @CFLAGS@ $(AM_CFLAGS) -I$(srcdir) -I$(srcdir)/.. \
    289         -I$(srcdir)/dtgtk -Werror -g $(RSVG_CFLAGS)
     289        -I$(srcdir)/dtgtk -Werror -g -Wno-error=unused-but-set-variable $(RSVG_CFLAGS)
    290290CPP = @CPP@
    291291CPPFLAGS = @CPPFLAGS@
    292292CURL_CFLAGS = @CURL_CFLAGS@
    … …  
    295295CXXCPP = @CXXCPP@
    296296CXXDEPMODE = @CXXDEPMODE@
    297297CXXFLAGS = @CXXFLAGS@ $(AM_CPPFLAGS) -I$(srcdir) -I$(srcdir)/.. \
    298         -I$(srcdir)/dtgtk -Werror -g
     298        -I$(srcdir)/dtgtk -Werror -Wno-error=unused-but-set-variable -g
    299299CYGPATH_W = @CYGPATH_W@
    300300DATADIRNAME = @DATADIRNAME@
    301301DBUSGLIB_CFLAGS = @DBUSGLIB_CFLAGS@

  • src/libs/Makefile.am 

    diff -ru ../darktable-0.7.1-orig/src/libs/Makefile.am ./src/libs/Makefile.am
    old new  
    11include $(srcdir)/../shared.am
    22LDFLAGS= -module -avoid-version
    3 CFLAGS+=$(AM_CFLAGS) -I$(srcdir) -I$(srcdir)/.. -Werror -g -rdynamic
     3CFLAGS+=$(AM_CFLAGS) -I$(srcdir) -I$(srcdir)/.. -Werror -g -Wno-error=unused-but-set-variable
    44LTADD=$(OPENMP_CFLAGS) $(GEGL_LIBS) $(JPEG_LIBS) $(PNG_LIBS) $(LCMS_LIBS) $(EXIV2_LIBS) $(CAIRO_LIBS) $(GLADE_LIBS) $(GTK_LIBS) $(GTHREAD_LIBS) $(SQLITE_LIBS) -fPIC
    55libexport_la_SOURCES=export.c
    66libcopy_history_la_SOURCES=copy_history.c

  • src/libs/Makefile.in 

    diff -ru ../darktable-0.7.1-orig/src/libs/Makefile.in ./src/libs/Makefile.in
    old new  
    159159CATOBJEXT = @CATOBJEXT@
    160160CC = @CC@
    161161CCDEPMODE = @CCDEPMODE@
    162 CFLAGS = @CFLAGS@ $(AM_CFLAGS) -I$(srcdir) -I$(srcdir)/.. -Werror -g \
    163         -rdynamic
     162CFLAGS = @CFLAGS@ $(AM_CFLAGS) -I$(srcdir) -I$(srcdir)/.. -Werror -g -Wno-error=unused-but-set-variable
    164163CPP = @CPP@
    165164CPPFLAGS = @CPPFLAGS@
    166165CURL_CFLAGS = @CURL_CFLAGS@

  • src/views/Makefile.am 

    diff -ru ../darktable-0.7.1-orig/src/views/Makefile.am ./src/views/Makefile.am
    old new  
    11include $(srcdir)/../shared.am
    22LDFLAGS= -module -avoid-version
    3 CFLAGS+=$(AM_CFLAGS) -I$(srcdir) -I$(srcdir)/.. -Werror -g -rdynamic
     3CFLAGS+=$(AM_CFLAGS) -I$(srcdir) -I$(srcdir)/.. -Werror -g -Wno-error=unused-but-set-variable
    44LTADD=$(OPENMP_CFLAGS) $(GEGL_LIBS) $(JPEG_LIBS) $(PNG_LIBS) $(LCMS_LIBS) $(EXIV2_LIBS) $(CAIRO_LIBS) $(GLADE_LIBS) $(GTK_LIBS) $(GTHREAD_LIBS) $(SQLITE_LIBS) -fPIC
    55libdarkroom_la_SOURCES=darkroom.c
    66liblighttable_la_SOURCES=lighttable.c

  • src/views/Makefile.in 

    diff -ru ../darktable-0.7.1-orig/src/views/Makefile.in ./src/views/Makefile.in
    old new  
    138138CATOBJEXT = @CATOBJEXT@
    139139CC = @CC@
    140140CCDEPMODE = @CCDEPMODE@
    141 CFLAGS = @CFLAGS@ $(AM_CFLAGS) -I$(srcdir) -I$(srcdir)/.. -Werror -g \
    142         -rdynamic
     141CFLAGS = @CFLAGS@ $(AM_CFLAGS) -I$(srcdir) -I$(srcdir)/.. -Werror -g -Wno-error=unused-but-set-variable
    143142CPP = @CPP@
    144143CPPFLAGS = @CPPFLAGS@
    145144CURL_CFLAGS = @CURL_CFLAGS@