View | Details | Raw Unified | Return to bug 220982 | Differences between
and this patch

Collapse All | Expand All

(-)graphics/mesa-dri/Makefile.common (-2 / +2 lines)
Lines 14-22 Link Here
14
MESAVERSION=	${MESABASEVERSION}${MESASUBVERSION:C/^(.)/.\1/}
14
MESAVERSION=	${MESABASEVERSION}${MESASUBVERSION:C/^(.)/.\1/}
15
MESADISTVERSION=${MESABASEVERSION}${MESASUBVERSION:C/^(.)/-\1/}
15
MESADISTVERSION=${MESABASEVERSION}${MESASUBVERSION:C/^(.)/-\1/}
16
16
17
MESABASEVERSION=	17.1.5
17
MESABASEVERSION=	17.2.0
18
# if there is a subversion, don't include the '-' between 7.11-rc2.
18
# if there is a subversion, don't include the '-' between 7.11-rc2.
19
MESASUBVERSION=
19
MESASUBVERSION=		rc2
20
20
21
MASTER_SITES=	https://mesa.freedesktop.org/archive/ \
21
MASTER_SITES=	https://mesa.freedesktop.org/archive/ \
22
		https://mesa.freedesktop.org/archive/${MESABASEVERSION}/ \
22
		https://mesa.freedesktop.org/archive/${MESABASEVERSION}/ \
(-)graphics/mesa-dri/distinfo (-3 / +3 lines)
Lines 1-3 Link Here
1
TIMESTAMP = 1500121822
1
TIMESTAMP = 1501498259
2
SHA256 (mesa-17.1.5.tar.xz) = 378516b171712687aace4c7ea8b37c85895231d7a6d61e1e27362cf6034fded9
2
SHA256 (mesa-17.2.0-rc2.tar.xz) = 701f66bf22bcfc95fbb00e34d052dc8818296d5748aa9bb2f5dd19f3e164a175
3
SIZE (mesa-17.1.5.tar.xz) = 9901876
3
SIZE (mesa-17.2.0-rc2.tar.xz) = 10326168
(-)graphics/mesa-dri/files/patch-src_egl_Makefile.in (+55 lines)
Line 0 Link Here
1
Force automake to use C++ compiler for linking by adding a
2
non-existent .cpp file to nodist_EXTRA_*_SOURCES.
3
4
./.libs/libEGL_common.a(libmesautil_la-string_to_uint_map.o):(.data.DW.ref.__gxx_personality_v0[DW.ref.__gxx_personality_v0]+0x0): undefined reference to `__gxx_personality_v0'
5
cc: error: linker command failed with exit code 1 (use -v to see invocation)
6
7
--- src/egl/Makefile.in.orig	2017-07-24 16:00:39 UTC
8
+++ src/egl/Makefile.in
9
@@ -197,9 +197,9 @@ AM_V_lt = $(am__v_lt_@AM_V@)
10
 am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
11
 am__v_lt_0 = --silent
12
 am__v_lt_1 = 
13
-libEGL_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
14
-	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
15
-	$(libEGL_la_LDFLAGS) $(LDFLAGS) -o $@
16
+libEGL_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
17
+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
18
+	$(CXXFLAGS) $(libEGL_la_LDFLAGS) $(LDFLAGS) -o $@
19
 @USE_LIBGLVND_FALSE@am_libEGL_la_rpath = -rpath $(libdir)
20
 am__DEPENDENCIES_1 =
21
 @HAVE_PLATFORM_X11_TRUE@am__DEPENDENCIES_2 = $(am__DEPENDENCIES_1)
22
@@ -304,6 +304,24 @@ AM_V_CCLD = $(am__v_CCLD_@AM_V@)
23
 am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
24
 am__v_CCLD_0 = @echo "  CCLD    " $@;
25
 am__v_CCLD_1 = 
26
+CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
27
+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
28
+LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
29
+	$(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) \
30
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
31
+	$(AM_CXXFLAGS) $(CXXFLAGS)
32
+AM_V_CXX = $(am__v_CXX_@AM_V@)
33
+am__v_CXX_ = $(am__v_CXX_@AM_DEFAULT_V@)
34
+am__v_CXX_0 = @echo "  CXX     " $@;
35
+am__v_CXX_1 = 
36
+CXXLD = $(CXX)
37
+CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
38
+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
39
+	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
40
+AM_V_CXXLD = $(am__v_CXXLD_@AM_V@)
41
+am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@)
42
+am__v_CXXLD_0 = @echo "  CXXLD   " $@;
43
+am__v_CXXLD_1 = 
44
 SOURCES = $(libEGL_la_SOURCES) $(libEGL_common_la_SOURCES) \
45
 	$(libEGL_mesa_la_SOURCES)
46
 DIST_SOURCES = $(libEGL_la_SOURCES) \
47
@@ -1014,7 +1032,7 @@ clean-noinstLTLIBRARIES:
48
 	}
49
 
50
 libEGL.la: $(libEGL_la_OBJECTS) $(libEGL_la_DEPENDENCIES) $(EXTRA_libEGL_la_DEPENDENCIES) 
51
-	$(AM_V_CCLD)$(libEGL_la_LINK) $(am_libEGL_la_rpath) $(libEGL_la_OBJECTS) $(libEGL_la_LIBADD) $(LIBS)
52
+	$(AM_V_CXXLD)$(libEGL_la_LINK) $(am_libEGL_la_rpath) $(libEGL_la_OBJECTS) $(libEGL_la_LIBADD) $(LIBS)
53
 main/$(am__dirstamp):
54
 	@$(MKDIR_P) main
55
 	@: > main/$(am__dirstamp)
(-)graphics/mesa-libs/Makefile (-1 / +2 lines)
Lines 14-19 OPTIONS_DEFINE= WAYLAND Link Here
14
OPTIONS_SUB=	yes
14
OPTIONS_SUB=	yes
15
15
16
WAYLAND_DESC=		Enable support for the Wayland platform in EGL
16
WAYLAND_DESC=		Enable support for the Wayland platform in EGL
17
WAYLAND_BUILD_DEPENDS=	wayland-protocols>=1.8:graphics/wayland-protocols
17
WAYLAND_LIB_DEPENDS=	libwayland-client.so:graphics/wayland \
18
WAYLAND_LIB_DEPENDS=	libwayland-client.so:graphics/wayland \
18
			libwayland-server.so:graphics/wayland
19
			libwayland-server.so:graphics/wayland
19
20
Lines 42-48 MESA_BUILD_WRKSRC= src/mapi Link Here
42
MESA_INSTALL_WRKSRC=	src/mapi
43
MESA_INSTALL_WRKSRC=	src/mapi
43
44
44
.if ${PORT_OPTIONS:MWAYLAND}
45
.if ${PORT_OPTIONS:MWAYLAND}
45
MESA_BUILD_WRKSRC+=	src/egl/wayland/wayland-drm src/egl/wayland/wayland-egl
46
MESA_BUILD_WRKSRC+=	src/util src/egl/wayland/wayland-drm src/egl/wayland/wayland-egl
46
MESA_INSTALL_WRKSRC+=	src/egl/wayland/wayland-egl
47
MESA_INSTALL_WRKSRC+=	src/egl/wayland/wayland-egl
47
.endif
48
.endif
48
49

Return to bug 220982