| Lorenz Brun | f95909d | 2019-09-11 19:48:26 +0200 | [diff] [blame] | 1 | Copyright 2020 The Monogon Project Authors. |
| 2 | |
| 3 | Licensed under the Apache License, Version 2.0 (the "License"); |
| 4 | you may not use this file except in compliance with the License. |
| 5 | You may obtain a copy of the License at |
| 6 | |
| 7 | http://www.apache.org/licenses/LICENSE-2.0 |
| 8 | |
| 9 | Unless required by applicable law or agreed to in writing, software |
| 10 | distributed under the License is distributed on an "AS IS" BASIS, |
| 11 | WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. |
| 12 | See the License for the specific language governing permissions and |
| 13 | limitations under the License. |
| 14 | |
| 15 | |
| 16 | From 780a94ddc5c50bded264bfc0dbfffdb4182cdc51 Mon Sep 17 00:00:00 2001 |
| 17 | From: Lorenz Brun <lorenz@nexantic.com> |
| 18 | Date: Mon, 9 Sep 2019 15:56:42 +0200 |
| 19 | Subject: [PATCH] Fixes for static compilation |
| 20 | |
| 21 | --- |
| 22 | include/xfs.h | 6 +++--- |
| 23 | mkfs/Makefile | 2 +- |
| 24 | 2 files changed, 4 insertions(+), 4 deletions(-) |
| 25 | |
| 26 | diff --git a/include/xfs.h b/include/xfs.h |
| 27 | index f2f675df..73687a16 100644 |
| 28 | --- a/include/xfs.h |
| 29 | +++ b/include/xfs.h |
| 30 | @@ -6,7 +6,7 @@ |
| 31 | #define __XFS_H__ |
| 32 | |
| 33 | #if defined(__linux__) |
| 34 | -#include <xfs/linux.h> |
| 35 | +#include "linux.h" |
| 36 | #else |
| 37 | # error unknown platform... have fun porting! |
| 38 | #endif |
| 39 | @@ -34,7 +34,7 @@ extern int xfs_assert_largefile[sizeof(off_t)-8]; |
| 40 | #define BUILD_BUG_ON(condition) ((void)sizeof(char[1 - 2*!!(condition)])) |
| 41 | #endif |
| 42 | |
| 43 | -#include <xfs/xfs_types.h> |
| 44 | -#include <xfs/xfs_fs.h> |
| 45 | +#include "xfs_types.h" |
| 46 | +#include "xfs_fs.h" |
| 47 | |
| 48 | #endif /* __XFS_H__ */ |
| 49 | diff --git a/mkfs/Makefile b/mkfs/Makefile |
| 50 | index 31482b08..57fb355d 100644 |
| 51 | --- a/mkfs/Makefile |
| 52 | +++ b/mkfs/Makefile |
| 53 | @@ -13,7 +13,7 @@ CFILES = proto.c xfs_mkfs.c |
| 54 | LLDLIBS += $(LIBXFS) $(LIBXCMD) $(LIBFROG) $(LIBRT) $(LIBPTHREAD) $(LIBBLKID) \ |
| 55 | $(LIBUUID) |
| 56 | LTDEPENDENCIES += $(LIBXFS) $(LIBXCMD) $(LIBFROG) |
| 57 | -LLDFLAGS = -static-libtool-libs |
| 58 | +LLDFLAGS = -all-static |
| 59 | |
| 60 | default: depend $(LTCOMMAND) |
| 61 | |
| 62 | -- |
| 63 | 2.20.1 |
| 64 | |