equal
deleted
inserted
replaced
38 COMPILER = gcc |
38 COMPILER = gcc |
39 |
39 |
40 # This is needed for things to be built correctly. |
40 # This is needed for things to be built correctly. |
41 CONFIGURE_ENV += CFLAGS="$(CFLAGS)" |
41 CONFIGURE_ENV += CFLAGS="$(CFLAGS)" |
42 |
42 |
|
43 # A normal 64-bit build would result in /usr/lib/$(MACH64)/rsyslog but since we |
|
44 # have a self-contained eco-system, simplify things for customers and just use |
|
45 # /usr/lib/rsyslog . |
|
46 CONFIGURE_LIBDIR.64 = $(CONFIGURE_LIBDIR.32) |
|
47 |
43 CONFIGURE_OPTIONS += --enable-imsolaris |
48 CONFIGURE_OPTIONS += --enable-imsolaris |
44 CONFIGURE_OPTIONS += --enable-mail |
49 CONFIGURE_OPTIONS += --enable-mail |
45 CONFIGURE_OPTIONS += --enable-gssapi_krb5 |
50 CONFIGURE_OPTIONS += --enable-gssapi_krb5 |
46 CONFIGURE_OPTIONS += --enable-gnutls |
51 CONFIGURE_OPTIONS += --enable-gnutls |
47 CONFIGURE_OPTIONS += --disable-klog |
52 CONFIGURE_OPTIONS += --disable-klog |
48 CONFIGURE_OPTIONS += --sbindir=/usr/lib/rsyslog |
53 CONFIGURE_OPTIONS += --sbindir=/usr/lib/rsyslog |
49 |
54 |
|
55 ASLR_MODE = $(ASLR_ENABLE) |
|
56 |
50 # common targets |
57 # common targets |
51 build: $(BUILD_32) |
58 build: $(BUILD_64) |
52 |
59 |
53 install: $(INSTALL_32) |
60 install: $(INSTALL_64) |
54 |
61 |
55 test: $(TEST_32) |
62 test: $(TEST_64) |
56 |
63 |
57 BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) |
64 BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) |
58 |
65 |
59 PKG_PROTO_DIRS += $(COMPONENT_DIR)/files |
66 PKG_PROTO_DIRS += $(COMPONENT_DIR)/files |
60 |
67 |