Gentoo Archives: gentoo-commits

From: "Michael Weber (xmw)" <xmw@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in app-text/mupdf/files: mupdf-0.6-buildsystem.patch
Date: Tue, 24 Aug 2010 23:08:48
Message-Id: 20100824230844.05DC82004E@flycatcher.gentoo.org
1 xmw 10/08/24 23:08:43
2
3 Added: mupdf-0.6-buildsystem.patch
4 Log:
5 Initial commit.
6 (Portage version: 2.1.8.3/cvs/Linux x86_64)
7
8 Revision Changes Path
9 1.1 app-text/mupdf/files/mupdf-0.6-buildsystem.patch
10
11 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/mupdf/files/mupdf-0.6-buildsystem.patch?rev=1.1&view=markup
12 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/mupdf/files/mupdf-0.6-buildsystem.patch?rev=1.1&content-type=text/plain
13
14 Index: mupdf-0.6-buildsystem.patch
15 ===================================================================
16 Michael Weber Jun 5th 2010
17 Possibility to pass /usr/lib64 on multilib/64bit systems.
18 Dropped the hard compiler options for compartibility on older chips.
19
20 --- Makefile 2010-06-05 16:38:48.000000000 +0200
21 +++ Makefile 2010-06-05 16:41:43.000000000 +0200
22 @@ -7,6 +7,7 @@
23
24 build ?= debug
25 prefix ?= /usr/local
26 +libprefix ?= $(prefix)/lib
27
28 OBJDIR := build/$(build)
29 GENDIR := build/generated
30 @@ -314,8 +315,8 @@
31 rm -rf build
32
33 install: $(DIRS) $(APPS) $(MUPDF_LIB)
34 - install -d $(prefix)/bin $(prefix)/lib $(prefix)/include
35 + install -d $(prefix)/bin $(libprefix) $(prefix)/include
36 install $(APPS) $(prefix)/bin
37 - install $(MUPDF_LIB) $(prefix)/lib
38 + install $(MUPDF_LIB) $(libprefix)
39 install $(MUPDF_HDR) $(prefix)/include
40
41 --- Makerules 2010-06-05 16:38:48.000000000 +0200
42 +++ Makerules 2010-06-05 16:49:44.000000000 +0200
43 @@ -4,8 +4,8 @@
44 OS := $(OS:MINGW%=MINGW)
45
46 LIBS := -ljbig2dec -lopenjpeg -ljpeg -lz -lm
47 -CFLAGS := -Wall --std=gnu99 -Ifitz -Imupdf $(THIRD_INCS)
48 -LDFLAGS =
49 +CFLAGS += -Wall --std=gnu99 -Ifitz -Imupdf $(THIRD_INCS)
50 +LDFLAGS +=
51 CC = cc
52 LD = $(CC)
53 AR = ar
54 @@ -23,10 +23,10 @@
55 CFLAGS += `pkg-config --cflags freetype2`
56 LDFLAGS += `pkg-config --libs freetype2`
57 endif
58 -X11LIBS = -lX11 -lXext
59 +X11LIBS = `pkg-config --libs x11 xext`
60 PDFVIEW_EXE = $(X11VIEW_EXE)
61 ifeq "$(build)" "release"
62 -CFLAGS += -mmmx -ftree-vectorize -msse -msse2 -march=k8 -DARCH_X86
63 +CFLAGS +=
64 ARCH_SRC = archx86.c
65 endif
66 endif