diff options
| author | Jeff Darcy <jdarcy@fb.com> | 2017-11-06 12:54:42 -0800 |
|---|---|---|
| committer | Jeff Darcy <jdarcy@fb.com> | 2017-11-20 12:35:31 -0800 |
| commit | b8caf1e774a9d8f52a6c630d687313c94aaec3c0 (patch) | |
| tree | 5b396c3695d973177be4f764424093b025bb505a /libglusterfs/src | |
| parent | c1a1472168ed626870a90b2ac3c7a408fd2b370e (diff) | |
build: merge our 3.6 and upstream 3.8 configure/specfile
Summary:
They have a common ancestor at 3.6, but there were hundreds of
lines of changes for each file on each side of the fork. In both
cases the easiest method was to take the upstream 3.8 version and
re-apply our own changes since we branched. Some changes were
dropped (e.g. runit) and a few other files needed new changes
(e.g. pkg-version) to keep up. Then there was more hacking to
fix stealth geo-rep dependencies, enable tirpc/IPv6, and so on.
Also added buildrpm38 and makerelease38. These should probably
not go upstream, but not sure what else to do with them.
Test Plan: Build RPMs. Install, create volumes, mount, do I/O.
Reviewers: sshreyas, #posix_storage
Reviewed By: sshreyas
Subscribers: jbacik, aquevedo, scientist, sshreyas, calvinowens, jweiner
Differential Revision: https://phabricator.intern.facebook.com/D6259797
Tasks: T20348589
Tags: posix-2017h2, gluster, posix_storage
Change-Id: I2d43fc6f7f5603293e406c21e4ec85bf19610b77
Signature: 6259797:1510694123:fc5d2975fec134a51d4b70f7f983cd71971e175a
Diffstat (limited to 'libglusterfs/src')
| -rw-r--r-- | libglusterfs/src/compat.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libglusterfs/src/compat.h b/libglusterfs/src/compat.h index 771ed983d32..0b14d20a481 100644 --- a/libglusterfs/src/compat.h +++ b/libglusterfs/src/compat.h @@ -483,6 +483,7 @@ int gf_mkostemp (char *tmpl, int suffixlen, int flags); #define CLOCK_REALTIME_COARSE CLOCK_REALTIME #endif +#if 0 #ifndef IPV6_DEFAULT #ifndef IXDR_GET_LONG @@ -502,6 +503,7 @@ int gf_mkostemp (char *tmpl, int suffixlen, int flags); #endif #endif /* IPV6_DEFAULT */ +#endif #if defined(__GNUC__) && !defined(RELAX_POISONING) /* Use run API, see run.h */ |