*: Update comment references to e2fsprogs-libuuid to libuuid.
PR: 251489
This commit is contained in:
@@ -107,7 +107,7 @@ EXTRA_PATCHES+= ${PATCHDIR}/libressl
|
||||
.endif
|
||||
|
||||
post-patch:
|
||||
# disable the detection of includes and library from e2fsprogs-libuuid,
|
||||
# disable the detection of includes and library from libuuid,
|
||||
# which introduces hidden dependency and breaks build
|
||||
@${REINPLACE_CMD} -e 's|uuid/uuid.h|ignore_&|' ${WRKSRC}/configure
|
||||
|
||||
|
||||
@@ -118,7 +118,7 @@ CONFIGURE_ARGS:= ${CONFIGURE_ARGS:N${LTO_CONFIGURE_ON}}
|
||||
.endif
|
||||
|
||||
post-patch:
|
||||
# disable the detection of includes and library from e2fsprogs-libuuid,
|
||||
# disable the detection of includes and library from libuuid,
|
||||
# which introduces hidden dependency and breaks build
|
||||
@${REINPLACE_CMD} -e 's|uuid/uuid.h|ignore_&|' ${WRKSRC}/configure
|
||||
|
||||
|
||||
@@ -117,7 +117,7 @@ CONFIGURE_ARGS:= ${CONFIGURE_ARGS:N${LTO_CONFIGURE_ON}}
|
||||
.endif
|
||||
|
||||
post-patch:
|
||||
# disable the detection of includes and library from e2fsprogs-libuuid,
|
||||
# disable the detection of includes and library from libuuid,
|
||||
# which introduces hidden dependency and breaks build
|
||||
@${REINPLACE_CMD} -e 's|uuid/uuid.h|ignore_&|' ${WRKSRC}/configure
|
||||
|
||||
|
||||
@@ -106,7 +106,7 @@ PLIST_SUB+= NO_NIS=""
|
||||
.endif
|
||||
|
||||
post-patch:
|
||||
# disable the detection of includes and library from e2fsprogs-libuuid,
|
||||
# disable the detection of includes and library from libuuid,
|
||||
# which introduces hidden dependency and breaks build
|
||||
@${REINPLACE_CMD} -e 's|uuid/uuid.h|ignore_&|' ${WRKSRC}/configure
|
||||
@${REINPLACE_CMD} -e '/find_library_file/ s|uuid|ignore_&|' ${WRKSRC}/setup.py
|
||||
|
||||
@@ -32,7 +32,7 @@ TEST_TARGET= check
|
||||
.endif
|
||||
|
||||
pre-patch:
|
||||
### Fixes lib conflicts with misc/e2fsprogs-libuuid ###
|
||||
### Fixes lib conflicts with misc/libuuid ###
|
||||
@${REINPLACE_CMD} 's/libuuid.la/libossp-uuid.la/ ; s/libuuid++.la/libossp-uuid++.la/' \
|
||||
${WRKDIR}/${DISTNAME}/Makefile.in
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
### This Patch is to fix conflicts with misc/e2fsprogs-libuuid ###
|
||||
### This Patch is to fix conflicts with misc/libuuid ###
|
||||
--- Makefile.in.orig 2016-02-07 14:59:23 UTC
|
||||
+++ Makefile.in
|
||||
@@ -74,7 +74,7 @@ CXX_OBJS = uuid++.lo $(LIB_OBJS)
|
||||
|
||||
Reference in New Issue
Block a user