Go to:
Gentoo Home
Documentation
Forums
Lists
Bugs
Planet
Store
Wiki
Get Gentoo!
Gentoo's Bugzilla – Attachment 146624 Details for
Bug 213969
media-libs/freeimage-3.10.0 version bump
Home
|
New
–
[Ex]
|
Browse
|
Search
|
Privacy Policy
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
files/freeimage-3.10.0-build.patch
freeimage-3.10.0-build.patch (text/plain), 4.18 KB, created by
Christian Larsen
on 2008-03-19 23:41:36 UTC
(
hide
)
Description:
files/freeimage-3.10.0-build.patch
Filename:
MIME Type:
Creator:
Christian Larsen
Created:
2008-03-19 23:41:36 UTC
Size:
4.18 KB
patch
obsolete
>--- Makefile.orig 2008-03-20 00:07:09.000000000 +0100 >+++ Makefile 2008-03-20 00:07:33.000000000 +0100 >@@ -1,31 +1,23 @@ > # Entry point for FreeImage makefiles >-# Default to 'make -f Makefile.gnu' for Linux and for unknown OS. > # >-OS = $(shell uname) >-MAKEFILE = gnu >- >-ifeq ($(OS), Darwin) >- MAKEFILE = osx >-endif >-ifeq ($(OS), Cygwin) >- MAKEFILE = cygwin >-endif >-ifeq ($(OS), Solaris) >- MAKEFILE = solaris >-endif > > default: >- $(MAKE) -f Makefile.$(MAKEFILE) >+ $(MAKE) -f Makefile.gnu >+ $(MAKE) -f Makefile.fip > > all: >- $(MAKE) -f Makefile.$(MAKEFILE) all >+ $(MAKE) -f Makefile.gnu all >+ $(MAKE) -f Makefile.fip all > > dist: >- $(MAKE) -f Makefile.$(MAKEFILE) dist >+ $(MAKE) -f Makefile.gnu dist >+ $(MAKE) -f Makefile.fip dist > > install: >- $(MAKE) -f Makefile.$(MAKEFILE) install >+ $(MAKE) -f Makefile.gnu install >+ $(MAKE) -f Makefile.fip install > > clean: >- $(MAKE) -f Makefile.$(MAKEFILE) clean >+ $(MAKE) -f Makefile.gnu clean >+ $(MAKE) -f Makefile.fip clean > >--- Makefile.gnu.orig 2008-03-20 00:07:14.000000000 +0100 >+++ Makefile.gnu 2008-03-20 00:07:35.000000000 +0100 >@@ -14,13 +14,13 @@ > # Converts cr/lf to just lf > DOS2UNIX = dos2unix > >-COMPILERFLAGS = -O3 -fPIC -fexceptions -fvisibility=hidden >+COMPILERFLAGS = -fPIC -fexceptions -fvisibility=hidden > LIBRARIES = -lstdc++ > > MODULES = $(SRCS:.c=.o) > MODULES := $(MODULES:.cpp=.o) >-CFLAGS = $(COMPILERFLAGS) $(INCLUDE) >-CXXFLAGS = $(COMPILERFLAGS) -Wno-ctor-dtor-privacy $(INCLUDE) >+CFLAGS += $(COMPILERFLAGS) $(INCLUDE) >+CXXFLAGS += $(COMPILERFLAGS) -Wno-ctor-dtor-privacy $(INCLUDE) > > TARGET = freeimage > STATICLIB = lib$(TARGET).a >@@ -55,15 +55,15 @@ > $(AR) r $@ $(MODULES) > > $(SHAREDLIB): $(MODULES) >- $(CC) -s -shared -Wl,-soname,$(VERLIBNAME) -o $@ $(MODULES) $(LIBRARIES) >+ $(CC) $(LDFLAGS) -shared -Wl,-soname,$(VERLIBNAME) -o $@ $(MODULES) $(LIBRARIES) > > install: >- install -m 644 -o root -g root $(HEADER) $(INCDIR) >- install -m 644 -o root -g root $(STATICLIB) $(INSTALLDIR) >- install -m 755 -o root -g root $(SHAREDLIB) $(INSTALLDIR) >- ln -sf $(SHAREDLIB) $(INSTALLDIR)/$(VERLIBNAME) >- ln -sf $(VERLIBNAME) $(INSTALLDIR)/$(LIBNAME) >- ldconfig >+ install -d $(DESTDIR)/$(INCDIR) $(DESTDIR)/$(LIBDIR) >+ install -m 644 $(HEADER) $(DESTDIR)/$(INCDIR) >+ install -m 644 $(STATICLIB) $(DESTDIR)/$(LIBDIR) >+ install -m 755 $(SHAREDLIB) $(DESTDIR)/$(LIBDIR) >+ ln -sf $(SHAREDLIB) $(DESTDIR)/$(LIBDIR)/$(VERLIBNAME) >+ ln -sf $(VERLIBNAME) $(DESTDIR)/$(LIBDIR)/$(LIBNAME) > > clean: > rm -f core Dist/*.* u2dtmp* $(MODULES) $(STATICLIB) $(SHAREDLIB) $(LIBNAME) >--- Makefile.fip.orig 2008-03-20 00:07:19.000000000 +0100 >+++ Makefile.fip 2008-03-20 00:07:34.000000000 +0100 >@@ -14,13 +14,13 @@ > # Converts cr/lf to just lf > DOS2UNIX = dos2unix > >-COMPILERFLAGS = -O3 -fexceptions -fvisibility=hidden >+COMPILERFLAGS = -fPIC -fexceptions -fvisibility=hidden > LIBRARIES = -lstdc++ > > MODULES = $(SRCS:.c=.o) > MODULES := $(MODULES:.cpp=.o) >-CFLAGS = $(COMPILERFLAGS) $(INCLUDE) >-CXXFLAGS = $(COMPILERFLAGS) -Wno-ctor-dtor-privacy $(INCLUDE) >+CFLAGS += $(COMPILERFLAGS) $(INCLUDE) >+CXXFLAGS += $(COMPILERFLAGS) -Wno-ctor-dtor-privacy $(INCLUDE) > > TARGET = freeimageplus > STATICLIB = lib$(TARGET).a >@@ -56,16 +56,15 @@ > $(AR) r $@ $(MODULES) > > $(SHAREDLIB): $(MODULES) >- $(CC) -s -shared -Wl,-soname,$(VERLIBNAME) -o $@ $(MODULES) $(LIBRARIES) >+ $(CC) $(LDFLAGS) -shared -Wl,-soname,$(VERLIBNAME) -o $@ $(MODULES) $(LIBRARIES) > > install: >- install -m 644 -o root -g root $(HEADER) $(INCDIR) >- install -m 644 -o root -g root $(HEADERFIP) $(INCDIR) >- install -m 644 -o root -g root $(STATICLIB) $(INSTALLDIR) >- install -m 755 -o root -g root $(SHAREDLIB) $(INSTALLDIR) >- ln -sf $(SHAREDLIB) $(INSTALLDIR)/$(VERLIBNAME) >- ln -sf $(VERLIBNAME) $(INSTALLDIR)/$(LIBNAME) >- ldconfig >+ install -m 644 $(HEADER) $(DESTDIR)/$(INCDIR) >+ install -m 644 $(HEADERFIP) $(DESTDIR)/$(INCDIR) >+ install -m 644 $(STATICLIB) $(DESTDIR)/$(LIBDIR) >+ install -m 755 $(SHAREDLIB) $(DESTDIR)/$(LIBDIR) >+ ln -sf $(SHAREDLIB) $(DESTDIR)/$(LIBDIR)/$(VERLIBNAME) >+ ln -sf $(VERLIBNAME) $(DESTDIR)/$(LIBDIR)/$(LIBNAME) > > clean: > rm -f core Dist/*.* u2dtmp* $(MODULES) $(STATICLIB) $(SHAREDLIB) $(LIBNAME)
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 213969
:
146621
|
146622
| 146624 |
146625