From patchwork Mon Apr 24 17:59:56 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jason Zaman X-Patchwork-Id: 9696867 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 7C2B260224 for ; Mon, 24 Apr 2017 18:01:27 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7094D283F9 for ; Mon, 24 Apr 2017 18:01:27 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 652BC28419; Mon, 24 Apr 2017 18:01:27 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.1 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from emsm-gh1-uea11.nsa.gov (emsm-gh1-uea11.nsa.gov [8.44.101.9]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E5AF7283F9 for ; Mon, 24 Apr 2017 18:01:25 +0000 (UTC) X-IronPort-AV: E=Sophos;i="5.37,245,1488844800"; d="scan'208";a="5158995" IronPort-PHdr: =?us-ascii?q?9a23=3AjzODbBS56XF61o/2hCVoHb0/ndpsv+yvbD5Q0YIu?= =?us-ascii?q?jvd0So/mwa68ZhOHt8tkgFKBZ4jH8fUM07OQ6PG+HzBYqs/Y4DgrS99lb1c9k8?= =?us-ascii?q?IYnggtUoauKHbQC7rUVRE8B9lIT1R//nu2YgB/Ecf6YEDO8DXptWZBUhrwOhBo?= =?us-ascii?q?KevrB4Xck9q41/yo+53Ufg5EmCexbal8IRiyrAjdrMYbjZdtJqos1xfEoWZDdv?= =?us-ascii?q?hLy29vOV+dhQv36N2q/J5k/SRQuvYh+NBFXK7nYak2TqFWASo/PWwt68LlqRfM?= =?us-ascii?q?TQ2U5nsBSWoWiQZHAxLE7B7hQJj8tDbxu/dn1ymbOc32Sq00WSin4qx2RhLklD?= =?us-ascii?q?sLOjgk+27ZkMxwiL9QrgynqRJx3oXYZJiZOft7cq7bYNgUR3dOXtxJWiJBHI2y?= =?us-ascii?q?coUBAekGM+laoYn9v1kDoQawCAayH+Pi0SNEimPs0KEmyektDR3K0Qo9FNwOqn?= =?us-ascii?q?TUq9D1Ob8WX++v16nIyjPDZO5V1jjn7YjHaBYhquyLULJya8XR0k4vFwXeg1WI?= =?us-ascii?q?t4PlJT2V1uULs2ia6OpgU/ijhHIgqwF0uzWiwNonhIfOhoIQ0F/E9CN5zZ46Jd?= =?us-ascii?q?KmTk57fdmkEJxKuyGdLYt2TcUvSHxrtiYi0rAKpJG2cScQxJkn2hLTceKLfoeW?= =?us-ascii?q?7h75SeqdOTd1iXZ/dL6ihBu/9VKsxvPgWsWqylpGszRJnsTKu3sQzRLc8NKHRe?= =?us-ascii?q?F4/kq53DaP0B3c5f9cLEAvkKrbN4YhwrktlpoPqUjDHjH5mEHxjKKOakUr4PKo?= =?us-ascii?q?6+X6YrX9vJOcK491hR3+MqQpgMC/B/g3MhMSUGSB/OS81bnj8VX4QLVMkPI2jr?= =?us-ascii?q?HUvI3VKMkUvKK0AxJZ3pw95xuwETuqyskUkWECLF1feRKHi4bpO0vJIPD9Ffq/?= =?us-ascii?q?mEqjkDNqx/DAI73gDYzBIWPEkLf8e7Zy91BTyBEowNBD55NbFrEBIPXpVk/3r9?= =?us-ascii?q?zXFAU1MwOzw+b5ENl9zJ8RWXqTAq+FN6PfqV2I5uUpI+aWeI8VuCzyK/4+6v7s?= =?us-ascii?q?in85n1odcrOy3ZsLdn+4BO9mL1+eYXr2jdcLCX0KsRYmTOz2lF2CViZeZ3SwX6?= =?us-ascii?q?0m+j47C5mmDYDFRoCsnryMxym7HplLZmFJEV+MDHHod5mZW/sWbyKSOMBhmCQe?= =?us-ascii?q?Vbe9U48hyQ2utAjixrp/MOXb4TMXtZTi1Nhp4O3ejhAy+iJqAMuDyW2NSHt0nm?= =?us-ascii?q?wQTT8swK9/uVB9ykuE0aVgnvNYEtpT5/VUXQgkMZ7czvd3BMrsVQLbedeFUlGm?= =?us-ascii?q?Qs+pATspVNI+38cOY1phG9Wllh3MwjaqDKUPl7GQGJM09afc0GTrKMZm13bKzq?= =?us-ascii?q?8hgEc6QsFXL22pmrZ/9xTPB47Oi0iZlqCqdbgC0y7J6miDyHSBvF1CUA9wSqjF?= =?us-ascii?q?WmgfaVXQrdT8/EzCTruuBq8gMgpO08KCLbFKatLxh1VcWPjjIMjeY362m2qoBR?= =?us-ascii?q?eJx7SMbIzxdmUY2CXREUkEkwYJ8XaALwc+HCSho2PADDNwD17vZV3j8fVmonOh?= =?us-ascii?q?UkA01x2Kb1Fm17et4REanvuQS/cS3rIfpCchsC94HE2j0N3KEdaAvBRufKFdYd?= =?us-ascii?q?M7/VdG2nnUuBB9P5y6MqBinUQScgptsEPyzBV3DYNAndItrHMwwwp4MbiY309Z?= =?us-ascii?q?dzOEwZDwPaXaJXfq/B+1ca7W20re3c2O+qgV8vQ4qk7jvBmtFkU473pozcNZ03?= =?us-ascii?q?yG5pXFFAASS47+Ul4r9xhmoLHXeic854LQ1X1pL6a0qCTP29w3C+Q4zRagZc1Q?= =?us-ascii?q?MLueFA/1Ec0VGdShKPAwl1iudBIEM/hY9LQoMMO+a/uGxKmrMf5unDK8l2tH5p?= =?us-ascii?q?xy0kOX9ydnT+7Ix5cFz+iD3gqJTDfwllChstr4mYpcfzEdAnK/yTT4BI5WfqBy?= =?us-ascii?q?fpwECWSpI82q3dh+hITiW31f9F6+HV8G39WpeRWKZVznwQJQzVgXoWCgmSag1T?= =?us-ascii?q?N7jisprquB0yzU2OntbgYIOmtRSGlll1fsLpC+j8oGU0iwcwgpiByl6F7myKdB?= =?us-ascii?q?oKRwMXLTQVtIfijxNGxiSbe/trucbM5J9JMosD9YXP66YV+EVr73uwEa3D/7H2?= =?us-ascii?q?tC2DA7cCmnuo73nxxgj2KdN2pzoWHCecF2whfe6tncSuRX3jYcQil3lyXXDECm?= =?us-ascii?q?P9a15dWUi4vDsuemWmOvTJJTdTXrwp2atCug/mBqHwOwn+qold36FAg2yyj718?= =?us-ascii?q?NlVS/QthbzfpHr17imMeJgZkRoGELz5Nd7Go5klos9n40f2X8fhpqJ53UHinvz?= =?us-ascii?q?Pc9d2a3gcHoHXSQLzMLN4Aj5xE1jKWqEx5z4VnqB3sthYMO6bnkK1SI96MBKDq?= =?us-ascii?q?iU4adAnSt0pFq3txjRYf9nkjca0/su52YQg/sVtwo10iWdHrcSEFFcPSztjBSI?= =?us-ascii?q?88myrL5Ja2arcLiw0ld+nN+6AbGZugFcWXD5epY+Ei9r9Ml/NkzD0GHr4IH+ZN?= =?us-ascii?q?bQdc4TtgGTkxrYlehVL5Yxlv4Uiip9JW39unMkxvUgjRxzwZ66p5KLK2J3/KK2?= =?us-ascii?q?GhRYLCH6Z9sP+jHxiqZTht6W0JqyHpVlADkERoHkQumvEDIWqfTnMACOHSY5qn?= =?us-ascii?q?uHH7rfGhOQ5F1gr33RD5ChL2uXK2UBzdV+WBmdI1RSgAMKUzU8hZ40DQOqy9Ln?= =?us-ascii?q?cEdi4DAe+EL4pgFLyuJyOBn1Sn3fqxuwajcoVJifKwJb7hlY6EfINcyR8PpzED?= =?us-ascii?q?te/p29sgONMHeWZxlTDW4XQEyEHErvPqKp5dnd6eiXGvSxL/XJYbWUpuxRSe2E?= =?us-ascii?q?xZSx3Yt65zyMLNmAPmF+D/0n3UpORW55G8LElDgUVSwXkT/Cb86BqBe65CJ3st?= =?us-ascii?q?i18O73VwL3+YuPF7xSPM13+x+snKeDM/Wdizp4KTZE1pIA3HHIx6IZ3FIIjCFu?= =?us-ascii?q?bTatG6watSHRVKLQhrNXDxkDZiNwNMpI67wz0xJIOc7chNP12KB3juIpC1dFUl?= =?us-ascii?q?zhn9+madYMI26jKFPNHFyLO6ieJT3X38H3ZruxSbNKg+VSqx2wvjObHlTtPjud?= =?us-ascii?q?ijbpUAqvPvtUjCGBOxxeup+yfQpxCWT5S9LmcBK7OsdtjTIq2b00mm/KNWkEPD?= =?us-ascii?q?hmbkxCs6ad7SxdgvRwAWBB6GRqLfWckSaD8+bYMooWsedsAilsjeJW+no7x6FQ?= =?us-ascii?q?7C5eQPx1nyvTo8V0rF66l+mD0D1nUABBqjxTnoKEoV1iObnF9plHQXvE8ggN4n?= =?us-ascii?q?uNBBQRvdRlDMHvu6dLytXUjq38NDJC/8jT/csGCMjeMNiHP2Y5MRr1BD7UCxMI?= =?us-ascii?q?TTixNW7Fn0xdiOqf9nOUrpggsZjshJQOSr5dVFMvEPMVFkVlE8YGIJttWTMki7?= =?us-ascii?q?GbhtYS5XWitBnRWNlavpffW/2PGvXgNiyWjbZeZxQS37P1Np8TOZf420x/cFl1?= =?us-ascii?q?hp7GG07NXdBLuCJhdBY4oFlK8Hh9Tmwz3FjpagWz738PDfS0hAI5ihNiYeQx8z?= =?us-ascii?q?fh+1E3JlvOpCs0jkYxgs7ojiqPfz7rK6e8R4ZWCzD7t0IpKJP0Xx51bRGunUxj?= =?us-ascii?q?LDrLXLNRj7RndWBtkwLTpIVAFuVdTaJeZh8c3/aXZ+8n0V5EsCWo2VdH5ffZCZ?= =?us-ascii?q?tljAYla5GsoGhe2w19d9M1IrTQK7RPzlhVnK2Ovyuo2fs2wA4RPUoN93mSeCEQ?= =?us-ascii?q?skwSKrYmPzao/vBr6QGahztDf20MW+AwovJt90IyJeKAwDn6075ENE+xNPeSIL?= =?us-ascii?q?+eu2jFicGHWEgw1l8Sm0lD47d2zd8pc1CIWEA30LuRCxMJONLEKQ5LdcVS8GPe?= =?us-ascii?q?fSWJseXW3ZJ6JYO9FvvrTe+PrqoUhFyrHBoxFYQW8ssBBoWs0F3fLcr/Nr4K1w?= =?us-ascii?q?4t6xrxK1WfEPtJeAmGnywGo8Gl0ZB32oddJikHAWpjMSS7/LDXqRE2gPCbRtc5?= =?us-ascii?q?fm8aXpcYNnIxQMC1hjRWv2pBDDaqyeIU0xKN7yXmpiTXAjj8dMRsa+uJZRN2Cd?= =?us-ascii?q?G25TU+/7KwiVHJ7pXUP3v6Osh6ut/T9eMaoI6KC/dTTblnrUjcnYhZR3uxXm7A?= =?us-ascii?q?F961OoL8a442bdz7Eny6SECwiyopT8ftO9agNrOIjh/sRYZVtombwT8iONShGT?= =?us-ascii?q?EZHhd/u/sM5LlgZQEZZZo0fwLovRwkN6OjOAeYzsmuQ2G1JDRLU/ZfyOK6Z7pL?= =?us-ascii?q?zyYxdeK61mUvTos7z+i29k4NQosGjhfAyva/f4NeSzT8GmRBewXToio0j2thNv?= =?us-ascii?q?wyw+glxhPIrVkcPiuEdOxucGxLo8swBVWMLnVqEmA4XUOTjZLf4g6w2LAf5zdd?= =?us-ascii?q?n9dR0e1CrHj+vp/ebSmxV6yqqZTaqTEvYcIgo6JvLYzpOtGGu4/GnjzDUJnQtR?= =?us-ascii?q?WIUCGgF/VAnNhQPDlVQPhPmWArP8wGpYpB5lQwVsc4O7xAFrMsqqqsaTV6ES4Y?= =?us-ascii?q?1TUZWJ+Y3Dwenue83KPXmQ2UcJQjLBMLro1Ngt4dUi5wZSMeorWsWp7NmG+FUG?= =?us-ascii?q?cLJh4f7QpR5A4akI9/YPzl6pLSTJBQ0z5Wv+50UizTG5Zz6VT7THqbjkLlR/W/?= =?us-ascii?q?jeOpxxlSw+j20tgbQhJ/DlJdx+lOnEsyNL53M7UQvpLNsjKQb0P6umPtx/emJF?= =?us-ascii?q?lWzc3UbEX2ApPYu2TmTiAS/mYZSpNIyHHaCZsdiRF5aLoxqFVKPo+mZl705yY4?= =?us-ascii?q?yIRxA7m4Sceryk45onYEXSilD8FMBP1hsFLTXD1lYo6kqI/5O5pMXmBQ+IeRq1?= =?us-ascii?q?BDkEViKyS504ZTK9lR4j4QWzhCuS+ds8GoSM1EwsB7FIMMIs1ltHfjBqxEPJmR?= =?us-ascii?q?o3s5urzry3/Z9DA8sEu0xDqpAa+4SvhV/2sAFQU1P26esFUgD/Mw8mfO9VDAql?= =?us-ascii?q?518/1HCbiPjEVxpTd9EYpNBjtS1HCqMUp8Q2dcv+VdMqTVfNRWQ+Muah+3Jxw+?= =?us-ascii?q?Cfkm0lSR/UFzmXf2eTZytwVd+yDZUQk5TiwVgrDqmT0FtM6oJSUaS5VTbTU6bi?= =?us-ascii?q?fFLQ2blTpQvBZFZEFgQ4oZDcpd+7EHwYtU+dLPRly2KSEYWhxuLAE43OFelU5C?= =?us-ascii?q?sUWYZTvSARCudfnRrh19Zd2Ro9KxLPTl4AdHjZvqsPw/96UGXHCmhRGhQdXFoI?= =?us-ascii?q?PmsN2FqFeOfr/iM+KgeX/BUCTMjReoiLckFZbK5TLcMA5GJJRh1HUrf4DhCXbV?= =?us-ascii?q?MhRCOa0bPVBXVadgadVJuupafdNreL4V+a9xARKKXhHvGIuxo/RdM1ncWy/eID?= =?us-ascii?q?ub8uyjv43c8KbRSe7+acyQ33zHWb54Po9m6TnnHLfnyZRR+kTq1ftx9E52VFbL?= =?us-ascii?q?Pjudo9TmIwME+NOtdlD+vpEzGzPZHotwmmL3xk5cb8oXXzGq8JMAxZND9nn/VO?= =?us-ascii?q?J43VLvsOBJ87lk7pc37K53xcioIqfdNOpVvVVhAheKGgVg7o8tD3RnR2BNfu8R?= =?us-ascii?q?L+/cfbwCjcDyse/4CrAX5QaO++xedNvHPV3Olde5CjGAUxxLhgMBpSQdLguG2P?= =?us-ascii?q?6Pg7V0Rtq9pejlxkIt5ECzLgIczL9z+4iL57GFpPLTbxvN17gLQLbqRsL0rrQo?= =?us-ascii?q?pUyS+ecolLkUemx6ewenCvQSVtYBxmf8yqAn1ScsHNnHH7Lk5vFDS245kSj6lJ?= =?us-ascii?q?1mGVUZBO8UHaGX8otEhmc3hfbVNtsIfaBegmyPDwKrEqceyX637CuaOGtljQvU?= =?us-ascii?q?0xH3WmOz6EX5rTFjTCvJ0tfjllZVVrirCkdTRSWpP1R4vCmIPAryu9r9ob4141?= =?us-ascii?q?0uMmz4qNKNk3OsOLFNEM35KtycOy40q08Jg5AqWtygw4YbGcG6INsL9nFxcOfe?= =?us-ascii?q?4XuxkyBdu6dHm5be4saN9/XYAHmgjqmaq7GTyzBd0XU3oE8w5cuhNv7U4d2GWf?= =?us-ascii?q?Oo13weTy1noQvOQwa1qqDHr1ATIUGL1kPLlZcLPtFf2Hk0zEDm5O4tQNIp7gpe?= =?us-ascii?q?DZrAZ+kfpT/vJDv03EyfbMwtWimZyTtXEUr/EUNkF6gkxGLwoMXJmG/V+10vQI?= =?us-ascii?q?lwa0PnigJsAoU9KEIi8l4XzTQfEQkDbhCbFrKoBV//IYsCS0cDdQyN3KKmdacv?= =?us-ascii?q?wU1z3rSv6ffXbexnAqoANu1QjgCQk1dGHZIWq7cRQKpme19a9q7YuBTtC5T9U/?= =?us-ascii?q?jhj3owOuW/QtpG/sABq3si/gG/SgK76ZhZ8bYUkp+IebBfYZXXp8Bz9Vln6iQA?= =?us-ascii?q?diNTmxhzlRW5Xv4ApOr7+NjUrIKo6vqyVKYqX+gX9Rk0B2Flgpv1nl8ioc/Y1/?= =?us-ascii?q?1dSo3ThoTz6gZNLGCWuIzCyRlzNfIOK563fLZn73gHJikfKGgUMtWKcPQ8+DFi?= =?us-ascii?q?MCnN6FNeGM8MYskYPMXVkwBOlkLpQK1T9tbcGlKAEIhzdtso7mTtxzA38Js8Tv?= =?us-ascii?q?7g5yWrJZDb9FxCI/RDgzhym93YuegV2/3SCDIN7nWDbBh12CyCwYGXC/ns5eWM?= =?us-ascii?q?1M3UV1QeEy4uSYhdOCaN+QypR+qyjpXpURqY6tTtj5I6dUKQQGGxnasev6ZUC+?= =?us-ascii?q?FAljn03jhQF4DynfKVsMCg6GhJuV1dFoZ88xnFFL9YPpVhNhTyjtOrSVRkBivj?= =?us-ascii?q?ZMHUcQIjuPaMxugS5+VxLU3+apEALx0ZyrL65ntVThd0R77tpFmZR/8RaMFgSP?= =?us-ascii?q?zasnBf8ZhgJLMXPFiBuJzqqS9FqF8sDw8zdrAwsjxae1LKnA1UR6b7pr4AhREB?= =?us-ascii?q?Ud5io0NMH3y/OH4m7TrdSatVlLWRCOAS8jiLQawBTUNoMj95QxOy35luYKWmnf?= =?us-ascii?q?RGsmNAgyN8r+Mn0zh4SxumuSzjvbgB2TQ+97GkrD8Bo2BKTv2CkyfUDlVO1PIK?= =?us-ascii?q?jaYABHbl7VyzemIDYJHz4LlgIsTg7pIh7m86YRgscCwKR+OgCzv/j6mQGIyArM?= =?us-ascii?q?pchAKRuMXJdbKzIjQdNq8myR76WnZz3Q7QnBdu8GsWTTSt99AkJICnNsYj2CWk?= =?us-ascii?q?A2/bdEwD4qlRqsv+qUYLTPcqaVNm2Ghj0M+HRi0LRMDVB2k1jgwkaXhZf5NC6B?= =?us-ascii?q?8aEbIogjWJvqRd4AEUYSnUHZ6h+obNnMfEw389Qsl2xmjOvK2Kmosq0GF5m9Nz?= =?us-ascii?q?9iOOuWoSePbeU8J3Bnjzy5pQye35Z/W2qOwHT5FmyLu5Wv8YLsaj4Xe22IltWk?= =?us-ascii?q?K9xLQRAVS5MOEHxrrAXSaqU2uYVvqXc2SWmTY2LFLy7wGyLlIrcMdKs1M9Muza?= =?us-ascii?q?i55Tkw3hVr11STuUpV/f12EjKuQadwQ3uIi7YQAKSvAeZ/SEL+g03PI+EEcMb2?= =?us-ascii?q?POHSZuCe+2sV6snJB8O3Vk4EX6ffri/xvjMNuTBhkEC5DVooR2+fygSWKLIWVg?= =?us-ascii?q?wwFqPElo6+ffEEw8tuBBc5aQgNfQgM920fIfd/hzNy09psQcmoZ55omSzMiKcA?= =?us-ascii?q?vewoz0Jd7LvviSG+ffwFgyemFGTroZZhv455k7Pt48QLDTAbpZsggfBackRJwt?= =?us-ascii?q?LWHx+79oLAlraA7eeKy0gtX2puKMfpZUon7W7lEzLCfboBADyOa7TQ98b5CsmX?= =?us-ascii?q?ryJoo8RjRfoN1xEhFmBpdAG9scrwq7BJ6ZgLq0hMG3+0NmoOIKqq7wCvfW1NSl?= =?us-ascii?q?wYV+QYVV6VaMPDbLC6lhml5lgfiqgvfczpnxDtvved0aW+h/Q27FcqHJE56+Kz?= =?us-ascii?q?KPP8L8flBJ86SY0L1nSBmRYzr5X6Wevi2+KPpk+Vk7ypB/fOfLwj0t96vb2Nru?= =?us-ascii?q?aG5FvSqjqH+JNIdF7FPUH+DeWAhUSfWd+mZ/AaIXdZf09PsJMdE6x9ic5xd84S?= =?us-ascii?q?9a0MuBOaehtVPM2kNnepLHNkvmxTg2VZMMIBuhLUsmmXXZpWjFAXRAMsikLtFg?= =?us-ascii?q?gNKUDhzr+klwlnghZmpAGmrzWdeRInMW28Okaw2M8wJHFdEDn/S4eUQgrK29Vf?= =?us-ascii?q?FoOolZmeWtrLgHishmKyXORMhcIiHRI7h6MDVNDuXPulcoeAALs6AvVYouZpiB?= =?us-ascii?q?PlkHMEGexiP21gTCzEL0e8ar1KaTLyYc6m9HwK7d0ThQuwm5vu6Ugsj5X7/FbJ?= =?us-ascii?q?H2XfjSMC0+WzGERDQyF1im+VOlu/oCofqZLn0TolcOYiKdEAQTvLxgrcDMDm/P?= =?us-ascii?q?nu1uZJ8Ki+qZWyD3UyJ1j7cyBiBXtUCMRPoDCAbWb3/9gGZGvgytOONM92r/b7?= =?us-ascii?q?KE3qpVR/AWAoxUf/2WWdTXYupeJzY2mTUdI+u8YdncoKwi0lLJUGsVCa/I+0OC?= =?us-ascii?q?TESOWPyT2yrrXZkJv4gzoico+NfQnihtE6TSPrafvCWj8oiigyadp+LeV3MhY0?= =?us-ascii?q?svgOINGGOB2gVPKHkYC9EJv0HgWrWAZ0hJ1H01iO9j2AQBeBptXX10031XnfG9?= =?us-ascii?q?GstDRV4SkmyuXOUMbEprAzMo4U+K/grybMQCucDUQW9e8qABSY8DI/Y15onXP7?= =?us-ascii?q?EQz+o30z58piw1rTmdXBthiVee/q7RGr9s7qFT7mk/ufdtVweARC2MXHLAz9+E?= =?us-ascii?q?AtlIw29cqHXt0YKAvOl2M71yv4xjDlYMACVwYNva+GYSAinPxAKuskPjT3ylKz?= =?us-ascii?q?UD7WNOeyE=3D?= X-IPAS-Result: =?us-ascii?q?A2FUBQCPPP5Y/wHyM5BcHQEFAQsBGAEFAQsBgwApYYEMjm+?= =?us-ascii?q?RZ5Z5LAeBc4gdVwEBAQEBAQEBAgECaCiCMyINRlcBAQEBAQEBIwINIjwGAQI9A?= =?us-ascii?q?QE4AgMJAQEXMQgDATABBQEcGQWITIFKAQ6eHz+LHYMOJgKCYAEBBYg7CBKEMYN?= =?us-ascii?q?tgmWKUR+REow0hxeLYneBa4gQJ4ZLimuHZjOBFViBBiYdCBgVhF0BCzWCG2gBi?= =?us-ascii?q?TUBAQE?= Received: from unknown (HELO tarius.tycho.ncsc.mil) ([144.51.242.1]) by emsm-gh1-uea11.nsa.gov with ESMTP; 24 Apr 2017 18:01:24 +0000 Received: from prometheus.infosec.tycho.ncsc.mil (prometheus [192.168.25.40]) by tarius.tycho.ncsc.mil (8.14.4/8.14.4) with ESMTP id v3OI1NKr027419; Mon, 24 Apr 2017 14:01:24 -0400 Received: from tarius.tycho.ncsc.mil (tarius.infosec.tycho.ncsc.mil [144.51.242.1]) by prometheus.infosec.tycho.ncsc.mil (8.15.2/8.15.2) with ESMTP id v3OI0WEt093894 for ; Mon, 24 Apr 2017 14:00:32 -0400 Received: from goalie.tycho.ncsc.mil (goalie [144.51.242.250]) by tarius.tycho.ncsc.mil (8.14.4/8.14.4) with ESMTP id v3OI0Nbr026576 for ; Mon, 24 Apr 2017 14:00:32 -0400 X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: A1D/BAC6PP5YfanAVdFcHgYMgyuBCoEMoFaXBCiFfAKEElcBAgEBAQEBAhMBARY5hUUDA0ABATcBD1E0AQUBHBmIUYFKAQ6eIj+LHYMOgwgBAQWIEQEBAQEBBQIBHQgJAQiEMYNtgmWHVwyCbh+REow0hxeLYneBa4gQhnKSUTOBFVaBByYdCBgVhR6CG2gBiTUBAQE X-IPAS-Result: A1D/BAC6PP5YfanAVdFcHgYMgyuBCoEMoFaXBCiFfAKEElcBAgEBAQEBAhMBARY5hUUDA0ABATcBD1E0AQUBHBmIUYFKAQ6eIj+LHYMOgwgBAQWIEQEBAQEBBQIBHQgJAQiEMYNtgmWHVwyCbh+REow0hxeLYneBa4gQhnKSUTOBFVaBByYdCBgVhR6CG2gBiTUBAQE X-IronPort-AV: E=Sophos;i="5.37,245,1488862800"; d="scan'208";a="6027446" Received: from emsm-gh1-uea11.corp.nsa.gov (HELO emsm-gh1-uea11.nsa.gov) ([10.208.41.37]) by goalie.tycho.ncsc.mil with ESMTP; 24 Apr 2017 14:00:31 -0400 IronPort-PHdr: =?us-ascii?q?9a23=3AUDwByBwPzlQUsHLXCy+O+j09IxM/srCxBDY+r6Qd?= =?us-ascii?q?1OwfIJqq85mqBkHD//Il1AaPBtSFra4cwLOP4+jJYi8p2d65qncMcZhBBVcuqP?= =?us-ascii?q?49uEgeOvODElDxN/XwbiY3T4xoXV5h+GynYwAOQJ6tL1LdrWev4jEMBx7xKRR6?= =?us-ascii?q?JvjvGo7Vks+7y/2+94fdbghMhTexe7x/IAm5oQnMq8UbgpZpJ7osxBfOvnZGYf?= =?us-ascii?q?ldy3lyJVKUkRb858Ow84Bm/i9Npf8v9NNOXLvjcaggQrNWEDopM2Yu5M32rhbD?= =?us-ascii?q?VheA5mEdUmoNjBVFBRXO4QzgUZfwtiv6sfd92DWfMMbrQ704RSiu4qF2QxLulS?= =?us-ascii?q?wJNSM28HvPh8JwkqxVvRyvqR94zYHWboGYL+Zycr/HcN8GX2dNQtpdWipcCY28?= =?us-ascii?q?dYsPCO8BMP5coYbnvFsOqh2+DhSvC+z1zz9HnHn21rA93uQjCw7GxwsgH9QVvX?= =?us-ascii?q?TMstr1LqkSUeGzzKnJyjXDaela1iv66IjNax0sp+yHU7x3ccrU00YvFgXFg02f?= =?us-ascii?q?qYP7OTOVyuMNs2+B4+pnT+KvhGgqoBxyrDi33soglJXFi4YPxl3H9Sh12ps5KN?= =?us-ascii?q?mmREJhfNKpEZ9duzmaOoZyWM8uXmJltSIgxrEYpZK3YjIGxIk5yxLCbfGMbpKG?= =?us-ascii?q?7Qj5VOmLJDd1nHJld6y7hxa16UWgz/fzVsiw0FpTtipFnMXAumkD1xDO68WKTu?= =?us-ascii?q?Fx/kim2TaI2ADT7v9LLVoomqrcLp4t2r8wlpwNvkTfBiL6hln6gauMekgn+uWk?= =?us-ascii?q?8fnrb7H4qpOGKoN5iwXzPrwrmsOlAOQ4NgYOX3Kc+eS5zLDj/1f2QK5Njv0wia?= =?us-ascii?q?TZqI7VJd4Vpq64BQ9V04Ej6xClAzi619QYmGELLEhZdxKfk4jpJ1bOLejjDfih?= =?us-ascii?q?h1SskTFrx+3JP7D6HpXMLmTMkLfmfbpn7U5c0xA8wcpQ55JTFLFSaM70D1T8sN?= =?us-ascii?q?3eEw8RLx2/w+GhDs50kIwZRzGhGKicZYHbqliOrtAmJuCKLNsXsS36LdA96uTg?= =?us-ascii?q?jHk4nllbdq6si8hEIEukF+hrdh3KKUHnhc0MRD8H?= X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: =?us-ascii?q?A0HgBQCPPP5YfanAVdFcHgYMGQYMgwCBC?= =?us-ascii?q?oEMoFaXBCiBc4QJAoQSVwEBAQEBAQEBAgECEAEBFjkvgjMgD0ZXAQEBAQEBASM?= =?us-ascii?q?CDSI8AwNAAQE3AQ9RNAEFARwZiFGBSgEOnh8/ix2DDoMIAQEFiBEBAQEBAQUCA?= =?us-ascii?q?R0ICQEIhDGDbYJlh1cMgm4fkRKMNIcXi2J3gWuIEIZyimuHZjOBFVaBCCYdCBg?= =?us-ascii?q?VhR6CG2gBiTUBAQE?= X-IPAS-Result: =?us-ascii?q?A0HgBQCPPP5YfanAVdFcHgYMGQYMgwCBCoEMoFaXBCiBc4Q?= =?us-ascii?q?JAoQSVwEBAQEBAQEBAgECEAEBFjkvgjMgD0ZXAQEBAQEBASMCDSI8AwNAAQE3A?= =?us-ascii?q?Q9RNAEFARwZiFGBSgEOnh8/ix2DDoMIAQEFiBEBAQEBAQUCAR0ICQEIhDGDbYJ?= =?us-ascii?q?lh1cMgm4fkRKMNIcXi2J3gWuIEIZyimuHZjOBFVaBCCYdCBgVhR6CG2gBiTUBA?= =?us-ascii?q?QE?= X-IronPort-AV: E=Sophos;i="5.37,245,1488844800"; d="scan'208";a="5158918" X-IronPort-Outbreak-Status: No, level 0, Unknown - Unknown Received: from mail-pf0-f169.google.com ([209.85.192.169]) by emsm-gh1-uea11.nsa.gov with ESMTP/TLS/AES128-GCM-SHA256; 24 Apr 2017 18:00:30 +0000 Received: by mail-pf0-f169.google.com with SMTP id a188so15873243pfa.0 for ; Mon, 24 Apr 2017 11:00:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=perfinion-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=+mmcar7ZBG79z2/asM35uFc09O+FeVCOWfYbcFUie2M=; b=fSzQUPF9cR3P4TiCImL86Q5Lv+txAD3KkJyfcrLC206NfgCIeNsunex6tfilnjZZZx kw7kd4uSKDMKZwde2TlB6eT4+OA1NCUmtPLno8bi/kHx1nJmeubXtMeXZio2seaOSU00 UKrxX6D22RoPBhFEnDfZJKj0PenqIjmT6929gOOPinYJTB2zgJHzYlNQ0aWVS37GItfU XowJHUdegPUcGm0L3LeXfQ2B4DfCQR2hEY0HE3jxrK88T9xn4LsrJNg9EdWG++/eJ7Jt rjVxxBoDTRKZ4kJWzQf9o22fZdIW4zvOjx6VEMVze6SvKwaOIcf/fPPpZDeFV4tJI0FG AcYQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=+mmcar7ZBG79z2/asM35uFc09O+FeVCOWfYbcFUie2M=; b=WJj3Nw5hCe/c6K+8ipxRgHW6Gn5+ZvVZGNxV1WvUHKezDV2gJWc7LDD9jyMRyi9r63 BnCCURseRT9dJKDQ5LaO815szeUedGMNyeDHMWD3d82UH1gQmjte0di4g4tYaczSYw36 Vmsp2SPT9FWfs/J6CJ1Qz/4Ty9t1OPRMlr0wBxtNfSdrOFat7HDEubOjk1ZsP0DJeN6r Qw7fyHXzFwD//wFj7FrhC8hovBryxWgcXLjjJQMINxVA35VJQlf+qSKmHWYRxM6GvWkC 0NE82EyRvRutOV+b9GoTIdrWX9pYkNLFXN0slpPfzMyE/mhNX0VGutq4wTHuPviq7geJ aDNQ== X-Gm-Message-State: AN3rC/4MXvgj3IHbAuNfwo9Sn7CODfOpeS2OLdp7o5HTRN92l2Jc59mY 3370iLz5CCq6QQ== X-Received: by 10.99.9.131 with SMTP id 125mr26330658pgj.88.1493056828738; Mon, 24 Apr 2017 11:00:28 -0700 (PDT) Received: from localhost ([59.189.202.121]) by smtp.gmail.com with ESMTPSA id y187sm32046407pfy.67.2017.04.24.11.00.27 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 24 Apr 2017 11:00:28 -0700 (PDT) From: Jason Zaman To: selinux@tycho.nsa.gov Subject: [PATCH 4/7] Makefiles: drop -L/-I to system paths Date: Tue, 25 Apr 2017 01:59:56 +0800 Message-Id: <20170424175959.20998-4-jason@perfinion.com> X-Mailer: git-send-email 2.10.2 In-Reply-To: <20170424175959.20998-1-jason@perfinion.com> References: <20170424175959.20998-1-jason@perfinion.com> X-BeenThere: selinux@tycho.nsa.gov X-Mailman-Version: 2.1.20 Precedence: list List-Id: "Security-Enhanced Linux \(SELinux\) mailing list" List-Post: List-Help: Errors-To: selinux-bounces@tycho.nsa.gov Sender: "Selinux" X-Virus-Scanned: ClamAV using ClamSMTP The toolchain automatically handles them and they break cross compiling. LDFLAGS should also come before object files, some flags (eg, -Wl,as-needed) can break things if they are in the wrong place) Gentoo-Bug: https://bugs.gentoo.org/500674 Signed-off-by: Jason Zaman --- checkpolicy/Makefile | 2 +- checkpolicy/test/Makefile | 1 - libselinux/src/Makefile | 10 +++++----- libselinux/utils/Makefile | 5 +++-- libsemanage/src/Makefile | 8 ++++---- libsemanage/tests/Makefile | 8 ++++---- libsepol/utils/Makefile | 4 ++-- mcstrans/src/Makefile | 4 ++-- mcstrans/utils/Makefile | 4 ++-- policycoreutils/hll/pp/Makefile | 3 +-- policycoreutils/load_policy/Makefile | 4 ++-- policycoreutils/newrole/Makefile | 4 ++-- policycoreutils/run_init/Makefile | 4 ++-- policycoreutils/secon/Makefile | 4 ++-- policycoreutils/semodule/Makefile | 3 +-- policycoreutils/sestatus/Makefile | 4 ++-- policycoreutils/setfiles/Makefile | 3 +-- policycoreutils/setsebool/Makefile | 3 +-- python/audit2allow/Makefile | 1 - python/sepolicy/Makefile | 2 +- restorecond/Makefile | 2 +- sandbox/Makefile | 4 ++-- secilc/Makefile | 8 ++++---- semodule-utils/semodule_deps/Makefile | 1 - semodule-utils/semodule_expand/Makefile | 3 +-- semodule-utils/semodule_link/Makefile | 3 +-- semodule-utils/semodule_package/Makefile | 3 +-- 27 files changed, 48 insertions(+), 57 deletions(-) diff --git a/checkpolicy/Makefile b/checkpolicy/Makefile index 98fa380..68e11f2 100644 --- a/checkpolicy/Makefile +++ b/checkpolicy/Makefile @@ -14,7 +14,7 @@ YACC = bison -y CFLAGS ?= -g -Wall -Werror -Wshadow -O2 -pipe -fno-strict-aliasing -override CFLAGS += -I. -I${INCLUDEDIR} +override CFLAGS += -I. CHECKOBJS = y.tab.o lex.yy.o queue.o module_compiler.o parse_util.o \ policy_define.o diff --git a/checkpolicy/test/Makefile b/checkpolicy/test/Makefile index 54d07f8..0a31c5e 100644 --- a/checkpolicy/test/Makefile +++ b/checkpolicy/test/Makefile @@ -8,7 +8,6 @@ INCLUDEDIR ?= $(PREFIX)/include LIBSEPOLA ?= $(LIBDIR)/libsepol.a CFLAGS ?= -g -Wall -W -Werror -O2 -pipe -override CFLAGS += -I$(INCLUDEDIR) all: dispol dismod diff --git a/libselinux/src/Makefile b/libselinux/src/Makefile index c685e66..f1b8bd9 100644 --- a/libselinux/src/Makefile +++ b/libselinux/src/Makefile @@ -93,7 +93,7 @@ endif PCRE_LDLIBS ?= -lpcre -override CFLAGS += -I../include -I$(INCLUDEDIR) -D_GNU_SOURCE $(DISABLE_FLAGS) $(PCRE_CFLAGS) +override CFLAGS += -I../include -D_GNU_SOURCE $(DISABLE_FLAGS) $(PCRE_CFLAGS) SWIG_CFLAGS += -Wno-error -Wno-unused-variable -Wno-unused-but-set-variable -Wno-unused-parameter \ -Wno-shadow -Wno-uninitialized -Wno-missing-prototypes -Wno-missing-declarations @@ -133,17 +133,17 @@ $(SWIGRUBYLOBJ): $(SWIGRUBYCOUT) $(CC) $(CFLAGS) $(SWIG_CFLAGS) $(RUBYINC) -fPIC -DSHARED -c -o $@ $< $(SWIGSO): $(SWIGLOBJ) - $(CC) $(CFLAGS) -shared -o $@ $< -L. -lselinux $(LDFLAGS) $(PYLIBS) -L$(LIBDIR) + $(CC) $(CFLAGS) $(LDFLAGS) -L. -shared -o $@ $< -lselinux $(PYLIBS) $(SWIGRUBYSO): $(SWIGRUBYLOBJ) - $(CC) $(CFLAGS) -shared -o $@ $^ -L. -lselinux $(LDFLAGS) $(RUBYLIBS) -L$(LIBDIR) + $(CC) $(CFLAGS) $(LDFLAGS) -L. -shared -o $@ $^ -lselinux $(RUBYLIBS) $(LIBA): $(OBJS) $(AR) rcs $@ $^ $(RANLIB) $@ $(LIBSO): $(LOBJS) - $(CC) $(CFLAGS) $(LDFLAGS) -shared -o $@ $^ $(PCRE_LDLIBS) -ldl -L$(LIBDIR) -Wl,$(LD_SONAME_FLAGS) + $(CC) $(CFLAGS) $(LDFLAGS) -shared -o $@ $^ $(PCRE_LDLIBS) -ldl -Wl,$(LD_SONAME_FLAGS) ln -sf $@ $(TARGET) $(LIBPC): $(LIBPC).in ../VERSION @@ -156,7 +156,7 @@ $(AUDIT2WHYLOBJ): audit2why.c $(CC) $(filter-out -Werror, $(CFLAGS)) $(PYINC) -fPIC -DSHARED -c -o $@ $< $(AUDIT2WHYSO): $(AUDIT2WHYLOBJ) $(LIBSEPOLA) - $(CC) $(CFLAGS) -shared -o $@ $^ -L. $(LDFLAGS) -lselinux $(PYLIBS) -L$(LIBDIR) + $(CC) $(CFLAGS) $(LDFLAGS) -L. -shared -o $@ $^ -lselinux $(PYLIBS) %.o: %.c policy.h $(CC) $(CFLAGS) $(TLSFLAGS) -c -o $@ $< diff --git a/libselinux/utils/Makefile b/libselinux/utils/Makefile index 68f7097..995f444 100644 --- a/libselinux/utils/Makefile +++ b/libselinux/utils/Makefile @@ -44,8 +44,9 @@ override CFLAGS += -I/opt/local/include -I../../libsepol/include override LDFLAGS += -L../../libsepol/src -undefined dynamic_lookup endif -override CFLAGS += -I../include -I$(INCLUDEDIR) -D_GNU_SOURCE $(DISABLE_FLAGS) $(PCRE_CFLAGS) -LDLIBS += -L../src -lselinux -L$(LIBDIR) +override CFLAGS += -I../include -D_GNU_SOURCE $(DISABLE_FLAGS) $(PCRE_CFLAGS) +LDFLAGS += -L../src +LDLIBS += -lselinux PCRE_LDLIBS ?= -lpcre ifeq ($(ANDROID_HOST),y) diff --git a/libsemanage/src/Makefile b/libsemanage/src/Makefile index 77f6efc..dba50c8 100644 --- a/libsemanage/src/Makefile +++ b/libsemanage/src/Makefile @@ -61,7 +61,7 @@ CFLAGS ?= -Werror -Wall -W -Wundef -Wshadow -Wmissing-noreturn -Wmissing-format- SWIG_CFLAGS += -Wno-error -Wno-unused-but-set-variable -Wno-unused-variable -Wno-shadow \ -Wno-unused-parameter -override CFLAGS += -I../include -I$(INCLUDEDIR) -D_GNU_SOURCE +override CFLAGS += -I../include -D_GNU_SOURCE RANLIB ?= ranlib SWIG = swig -Wall -python -o $(SWIGCOUT) -outdir ./ @@ -81,17 +81,17 @@ $(SWIGRUBYLOBJ): $(SWIGRUBYCOUT) $(CC) $(CFLAGS) $(SWIG_CFLAGS) $(RUBYINC) -fPIC -DSHARED -c -o $@ $< $(SWIGSO): $(SWIGLOBJ) - $(CC) $(CFLAGS) $(LDFLAGS) -shared -o $@ $< -L. -lsemanage $(PYLIBS) -L$(LIBDIR) + $(CC) $(CFLAGS) $(LDFLAGS) -L. -shared -o $@ $< -lsemanage $(PYLIBS) $(SWIGRUBYSO): $(SWIGRUBYLOBJ) - $(CC) $(CFLAGS) $(LDFLAGS) -shared -o $@ $^ -L. -lsemanage $(RUBYLIBS) -L$(LIBDIR) + $(CC) $(CFLAGS) $(LDFLAGS) -L. -shared -o $@ $^ -lsemanage $(RUBYLIBS) $(LIBA): $(OBJS) $(AR) rcs $@ $^ $(RANLIB) $@ $(LIBSO): $(LOBJS) - $(CC) $(CFLAGS) $(LDFLAGS) -shared -o $@ $^ -lsepol -laudit -lselinux -lbz2 -L$(LIBDIR) -Wl,-soname,$(LIBSO),--version-script=libsemanage.map,-z,defs + $(CC) $(CFLAGS) $(LDFLAGS) -shared -o $@ $^ -lsepol -laudit -lselinux -lbz2 -Wl,-soname,$(LIBSO),--version-script=libsemanage.map,-z,defs ln -sf $@ $(TARGET) $(LIBPC): $(LIBPC).in ../VERSION diff --git a/libsemanage/tests/Makefile b/libsemanage/tests/Makefile index 885b544..9b27224 100644 --- a/libsemanage/tests/Makefile +++ b/libsemanage/tests/Makefile @@ -5,20 +5,20 @@ LIBDIR ?= $(PREFIX)/lib SOURCES = $(wildcard *.c) # Add the required external object files here: -LIBS = ../src/libsemanage.a -L$(LIBDIR) -lselinux -lsepol +LIBS = ../src/libsemanage.a -lselinux -lsepol ########################################################################### EXECUTABLE = libsemanage-tests CFLAGS += -g -O0 -Wall -W -Wundef -Wmissing-noreturn -Wmissing-format-attribute -Wno-unused-parameter -INCLUDE = -I../src -I../include -I$(PREFIX)/include -LDFLAGS += -lcunit -lbz2 -laudit +INCLUDE = -I../src -I../include +LDLIBS += -lcunit -lbz2 -laudit OBJECTS = $(SOURCES:.c=.o) all: $(EXECUTABLE) $(EXECUTABLE): $(OBJECTS) ../src/libsemanage.a - $(CC) $(OBJECTS) $(LIBS) $(LDFLAGS) -o $@ + $(CC) $(OBJECTS) $(LIBS) $(LDFLAGS) -o $@ $(LDLIBS) %.o: %.c $(CC) $(CFLAGS) $(INCLUDE) -c $*.c -o $*.o diff --git a/libsepol/utils/Makefile b/libsepol/utils/Makefile index 6864114..a13164e 100644 --- a/libsepol/utils/Makefile +++ b/libsepol/utils/Makefile @@ -3,8 +3,8 @@ PREFIX ?= $(DESTDIR)/usr BINDIR ?= $(PREFIX)/bin CFLAGS ?= -Wall -Werror -override CFLAGS += -I../include -LDLIBS += -L../src -lsepol +LDFLAGS += -L../src +LDLIBS += -lsepol TARGETS=$(patsubst %.c,%,$(wildcard *.c)) diff --git a/mcstrans/src/Makefile b/mcstrans/src/Makefile index ea463bc..709e1e0 100644 --- a/mcstrans/src/Makefile +++ b/mcstrans/src/Makefile @@ -10,12 +10,12 @@ PROG_OBJS= $(patsubst %.c,%.o,$(PROG_SRC)) PROG=mcstransd INITSCRIPT=mcstrans CFLAGS ?= -Wall -W -Wundef -Wmissing-noreturn -Wmissing-format-attribute -override CFLAGS += -I$(PREFIX)/include -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 +override CFLAGS += -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 all: $(PROG) $(PROG): $(PROG_OBJS) - $(CC) $(LDFLAGS) -pie -o $@ $^ -lselinux -lcap -lpcre $(LIBDIR)/libsepol.a -L$(LIBDIR) + $(CC) $(LDFLAGS) -pie -o $@ $^ -lselinux -lcap -lpcre $(LIBDIR)/libsepol.a %.o: %.c $(CC) $(CFLAGS) -fPIE -c -o $@ $< diff --git a/mcstrans/utils/Makefile b/mcstrans/utils/Makefile index 043d001..e6f329b 100644 --- a/mcstrans/utils/Makefile +++ b/mcstrans/utils/Makefile @@ -5,8 +5,8 @@ BINDIR ?= $(PREFIX)/sbin LIBSEPOLA ?= $(LIBDIR)/libsepol.a CFLAGS ?= -Wall -override CFLAGS += -I../src -I$(PREFIX)/include -D_GNU_SOURCE -LDLIBS += -L$(LIBDIR) -lselinux -lpcre +override CFLAGS += -I../src -D_GNU_SOURCE +LDLIBS += -lselinux -lpcre TARGETS=$(patsubst %.c,%,$(wildcard *.c)) diff --git a/policycoreutils/hll/pp/Makefile b/policycoreutils/hll/pp/Makefile index 09168bc..1ca6c9d 100644 --- a/policycoreutils/hll/pp/Makefile +++ b/policycoreutils/hll/pp/Makefile @@ -8,8 +8,7 @@ LIBEXECDIR ?= $(PREFIX)/libexec HLLDIR ?= $(LIBEXECDIR)/selinux/hll CFLAGS ?= -Werror -Wall -W -override CFLAGS += -I$(INCLUDEDIR) -LDLIBS = -lsepol -L$(LIBDIR) +LDLIBS = -lsepol PP_SRCS = $(wildcard *.c) PP_OBJS = $(patsubst %.c,%.o,$(PP_SRCS)) diff --git a/policycoreutils/load_policy/Makefile b/policycoreutils/load_policy/Makefile index 7c5bab0..6ab0f9d 100644 --- a/policycoreutils/load_policy/Makefile +++ b/policycoreutils/load_policy/Makefile @@ -6,8 +6,8 @@ MANDIR ?= $(PREFIX)/share/man LOCALEDIR ?= /usr/share/locale CFLAGS ?= -Werror -Wall -W -override CFLAGS += $(LDFLAGS) -I$(PREFIX)/include -DUSE_NLS -DLOCALEDIR="\"$(LOCALEDIR)\"" -DPACKAGE="\"policycoreutils\"" -LDLIBS += -lsepol -lselinux -L$(PREFIX)/lib +override CFLAGS += $(LDFLAGS) -DUSE_NLS -DLOCALEDIR="\"$(LOCALEDIR)\"" -DPACKAGE="\"policycoreutils\"" +LDLIBS += -lsepol -lselinux TARGETS=$(patsubst %.c,%,$(wildcard *.c)) diff --git a/policycoreutils/newrole/Makefile b/policycoreutils/newrole/Makefile index 8b41428..8bfbd5f 100644 --- a/policycoreutils/newrole/Makefile +++ b/policycoreutils/newrole/Makefile @@ -22,8 +22,8 @@ VERSION = $(shell cat ../VERSION) CFLAGS ?= -Werror -Wall -W EXTRA_OBJS = -override CFLAGS += -DVERSION=\"$(VERSION)\" -I$(PREFIX)/include -DUSE_NLS -DLOCALEDIR="\"$(LOCALEDIR)\"" -DPACKAGE="\"policycoreutils\"" -LDLIBS += -lselinux -L$(PREFIX)/lib +override CFLAGS += -DVERSION=\"$(VERSION)\" -DUSE_NLS -DLOCALEDIR="\"$(LOCALEDIR)\"" -DPACKAGE="\"policycoreutils\"" +LDLIBS += -lselinux ifeq ($(PAMH), /usr/include/security/pam_appl.h) override CFLAGS += -DUSE_PAM EXTRA_OBJS += hashtab.o diff --git a/policycoreutils/run_init/Makefile b/policycoreutils/run_init/Makefile index 5815a08..a3beef7 100644 --- a/policycoreutils/run_init/Makefile +++ b/policycoreutils/run_init/Makefile @@ -9,8 +9,8 @@ PAMH = $(shell ls /usr/include/security/pam_appl.h 2>/dev/null) AUDITH = $(shell ls /usr/include/libaudit.h 2>/dev/null) CFLAGS ?= -Werror -Wall -W -override CFLAGS += -I$(PREFIX)/include -DUSE_NLS -DLOCALEDIR="\"$(LOCALEDIR)\"" -DPACKAGE="\"policycoreutils\"" -LDLIBS += -lselinux -L$(PREFIX)/lib +override CFLAGS += -DUSE_NLS -DLOCALEDIR="\"$(LOCALEDIR)\"" -DPACKAGE="\"policycoreutils\"" +LDLIBS += -lselinux ifeq ($(PAMH), /usr/include/security/pam_appl.h) override CFLAGS += -DUSE_PAM LDLIBS += -lpam -lpam_misc diff --git a/policycoreutils/secon/Makefile b/policycoreutils/secon/Makefile index a2d9ca6..1f074ff 100644 --- a/policycoreutils/secon/Makefile +++ b/policycoreutils/secon/Makefile @@ -8,8 +8,8 @@ LIBDIR ?= $(PREFIX)/lib WARNS=-Werror -W -Wall -Wundef -Wshadow -Wpointer-arith -Wbad-function-cast -Wcast-align -Wwrite-strings -Waggregate-return -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -Wnested-externs -Wno-format-zero-length -Wformat-nonliteral -Wformat-security -Wfloat-equal VERSION = $(shell cat ../VERSION) CFLAGS ?= $(WARNS) -O1 -override CFLAGS += -DVERSION=\"$(VERSION)\" -I$(INCLUDEDIR) -LDLIBS = -lselinux -L$(LIBDIR) +override CFLAGS += -DVERSION=\"$(VERSION)\" +LDLIBS = -lselinux all: secon diff --git a/policycoreutils/semodule/Makefile b/policycoreutils/semodule/Makefile index 5b1c026..39ff6a9 100644 --- a/policycoreutils/semodule/Makefile +++ b/policycoreutils/semodule/Makefile @@ -6,8 +6,7 @@ MANDIR = $(PREFIX)/share/man LIBDIR ?= $(PREFIX)/lib CFLAGS ?= -Werror -Wall -W -override CFLAGS += -I$(INCLUDEDIR) -LDLIBS = -lsepol -lselinux -lsemanage -L$(LIBDIR) +LDLIBS = -lsepol -lselinux -lsemanage SEMODULE_OBJS = semodule.o all: semodule genhomedircon diff --git a/policycoreutils/sestatus/Makefile b/policycoreutils/sestatus/Makefile index c04ff00..8dbbc01 100644 --- a/policycoreutils/sestatus/Makefile +++ b/policycoreutils/sestatus/Makefile @@ -6,8 +6,8 @@ ETCDIR ?= $(DESTDIR)/etc LIBDIR ?= $(PREFIX)/lib CFLAGS ?= -Werror -Wall -W -override CFLAGS += -I$(PREFIX)/include -D_FILE_OFFSET_BITS=64 -LDLIBS = -lselinux -L$(LIBDIR) +override CFLAGS += -D_FILE_OFFSET_BITS=64 +LDLIBS = -lselinux all: sestatus diff --git a/policycoreutils/setfiles/Makefile b/policycoreutils/setfiles/Makefile index 92300c9..f7089f9 100644 --- a/policycoreutils/setfiles/Makefile +++ b/policycoreutils/setfiles/Makefile @@ -8,8 +8,7 @@ AUDITH = $(shell ls /usr/include/libaudit.h 2>/dev/null) ABORT_ON_ERRORS=$(shell grep "^\#define ABORT_ON_ERRORS" setfiles.c | awk -S '{ print $$3 }') CFLAGS ?= -g -Werror -Wall -W -override CFLAGS += -I$(PREFIX)/include -LDLIBS = -lselinux -lsepol -L$(LIBDIR) +LDLIBS = -lselinux -lsepol ifeq ($(AUDITH), /usr/include/libaudit.h) override CFLAGS += -DUSE_AUDIT diff --git a/policycoreutils/setsebool/Makefile b/policycoreutils/setsebool/Makefile index 45d6538..3295963 100644 --- a/policycoreutils/setsebool/Makefile +++ b/policycoreutils/setsebool/Makefile @@ -7,8 +7,7 @@ LIBDIR ?= $(PREFIX)/lib BASHCOMPLETIONDIR ?= $(DESTDIR)/usr/share/bash-completion/completions CFLAGS ?= -Werror -Wall -W -override CFLAGS += -I$(INCLUDEDIR) -LDLIBS = -lsepol -lselinux -lsemanage -L$(LIBDIR) +LDLIBS = -lsepol -lselinux -lsemanage SETSEBOOL_OBJS = setsebool.o BASHCOMPLETIONS=setsebool-bash-completion.sh diff --git a/python/audit2allow/Makefile b/python/audit2allow/Makefile index 4f03e95..8db8075 100644 --- a/python/audit2allow/Makefile +++ b/python/audit2allow/Makefile @@ -10,7 +10,6 @@ INCLUDEDIR ?= $(PREFIX)/include LIBSEPOLA ?= $(LIBDIR)/libsepol.a CFLAGS ?= -Werror -Wall -W -override CFLAGS += -I$(INCLUDEDIR) all: audit2why sepolgen-ifgen-attr-helper diff --git a/python/sepolicy/Makefile b/python/sepolicy/Makefile index bff8acc..647c540 100644 --- a/python/sepolicy/Makefile +++ b/python/sepolicy/Makefile @@ -12,7 +12,7 @@ LOCALEDIR ?= /usr/share/locale BASHCOMPLETIONDIR ?= $(DESTDIR)/usr/share/bash-completion/completions SHAREDIR ?= $(PREFIX)/share/sandbox CFLAGS ?= -Wall -Werror -Wextra -W -override CFLAGS += -I$(PREFIX)/include -DPACKAGE="policycoreutils" -DSHARED -shared +override CFLAGS += -DPACKAGE="policycoreutils" -DSHARED -shared BASHCOMPLETIONS=sepolicy-bash-completion.sh diff --git a/restorecond/Makefile b/restorecond/Makefile index 9f163f5..5016753 100644 --- a/restorecond/Makefile +++ b/restorecond/Makefile @@ -17,7 +17,7 @@ DBUSFLAGS = -DHAVE_DBUS $(shell $(PKG_CONFIG) --cflags dbus-glib-1) DBUSLIB = $(shell $(PKG_CONFIG) --libs dbus-glib-1) CFLAGS ?= -g -Werror -Wall -W -override CFLAGS += -I$(PREFIX)/include $(DBUSFLAGS) +override CFLAGS += $(DBUSFLAGS) USE_PCRE2 ?= n ifeq ($(USE_PCRE2),y) diff --git a/sandbox/Makefile b/sandbox/Makefile index 2716d69..b12fb77 100644 --- a/sandbox/Makefile +++ b/sandbox/Makefile @@ -9,8 +9,8 @@ SBINDIR ?= $(PREFIX)/sbin MANDIR ?= $(PREFIX)/share/man LOCALEDIR ?= /usr/share/locale SHAREDIR ?= $(PREFIX)/share/sandbox -override CFLAGS += -I$(PREFIX)/include -DPACKAGE="\"policycoreutils\"" -Wall -Werror -Wextra -W -LDLIBS += -lselinux -lcap-ng -L$(LIBDIR) +override CFLAGS += -DPACKAGE="\"policycoreutils\"" -Wall -Werror -Wextra -W +LDLIBS += -lselinux -lcap-ng SEUNSHARE_OBJS = seunshare.o all: sandbox seunshare sandboxX.sh start diff --git a/secilc/Makefile b/secilc/Makefile index e714a84..1e36c6e 100644 --- a/secilc/Makefile +++ b/secilc/Makefile @@ -4,7 +4,7 @@ MANDIR ?= $(PREFIX)/share/man LIBDIR ?= $(PREFIX)/lib INCLUDEDIR ?= $(PREFIX)/include -LDLIBS = -lsepol -L$(LIBDIR) +LDLIBS = -lsepol SECILC = secilc SECILC_SRCS := secilc.c @@ -20,18 +20,18 @@ XMLTO = xmlto CFLAGS ?= -Wall -Wshadow -Wextra -Wundef -Wmissing-format-attribute -Wcast-align -Wstrict-prototypes -Wpointer-arith -Wunused -override CFLAGS += -I$(INCLUDEDIR) -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 +override CFLAGS += -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 all: $(SECILC) $(SECIL2CONF) man $(SECILC): $(SECILC_OBJS) - $(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS) $(LDLIBS) + $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(LDLIBS) test: $(SECILC) ./$(SECILC) test/policy.cil $(SECIL2CONF): $(SECIL2CONF_OBJS) - $(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS) $(LDLIBS) + $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(LDLIBS) man: $(SECILC_MANPAGE) $(SECIL2CONF_MANPAGE) diff --git a/semodule-utils/semodule_deps/Makefile b/semodule-utils/semodule_deps/Makefile index 7d8490f..328a503 100644 --- a/semodule-utils/semodule_deps/Makefile +++ b/semodule-utils/semodule_deps/Makefile @@ -7,7 +7,6 @@ MANDIR ?= $(PREFIX)/share/man LIBSEPOLA ?= $(LIBDIR)/libsepol.a CFLAGS ?= -Werror -Wall -W -override CFLAGS += -I$(INCLUDEDIR) all: semodule_deps diff --git a/semodule-utils/semodule_expand/Makefile b/semodule-utils/semodule_expand/Makefile index dcbd6d6..22e3579 100644 --- a/semodule-utils/semodule_expand/Makefile +++ b/semodule-utils/semodule_expand/Makefile @@ -6,8 +6,7 @@ LIBDIR ?= $(PREFIX)/lib MANDIR ?= $(PREFIX)/share/man CFLAGS ?= -Werror -Wall -W -override CFLAGS += -I$(INCLUDEDIR) -LDLIBS = -lsepol -L$(LIBDIR) +LDLIBS = -lsepol all: semodule_expand diff --git a/semodule-utils/semodule_link/Makefile b/semodule-utils/semodule_link/Makefile index 4e8e828..1e4e278 100644 --- a/semodule-utils/semodule_link/Makefile +++ b/semodule-utils/semodule_link/Makefile @@ -6,8 +6,7 @@ MANDIR ?= $(PREFIX)/share/man LIBDIR ?= $(PREFIX)/lib CFLAGS ?= -Werror -Wall -W -override CFLAGS += -I$(INCLUDEDIR) -LDLIBS = -lsepol -L$(LIBDIR) +LDLIBS = -lsepol all: semodule_link diff --git a/semodule-utils/semodule_package/Makefile b/semodule-utils/semodule_package/Makefile index ca08bc4..5b0d2cc 100644 --- a/semodule-utils/semodule_package/Makefile +++ b/semodule-utils/semodule_package/Makefile @@ -6,8 +6,7 @@ LIBDIR ?= $(PREFIX)/lib MANDIR ?= $(PREFIX)/share/man CFLAGS ?= -Werror -Wall -W -override CFLAGS += -I$(INCLUDEDIR) -LDLIBS = -lsepol -L$(LIBDIR) +LDLIBS = -lsepol all: semodule_package semodule_unpackage